commit 5ddfdc94055c16b47602a7ad53f8c1ca5db3eaf1
author Tyler Gunn <tgunn@google.com> Thu Oct 31 13:08:23 2019 -0700
committer Tyler Gunn <tgunn@google.com> Mon Nov 11 08:31:16 2019 -0800
tree d99ffa774d7c99afbcff048fce69cd36c74f0242
parent 06533ae2756e39f66884e8006c0540b005e88d4b

Telephony mainline updates.

- Remove uses of TelecomManager#from and replace with proper
Context#getSystemService invocations.
- In NotificationManager#getShowVoicemailIntentForDefaultDialer, use a new
Telecom system API to get the dialer for a specific user instead of using
DefaultDialerManager directly.
- Update references to ConferenceParticipant which is not internal to
IMS.
- Remove Telecom logging references.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: If1090036d349cc72f86d523b781e09cd37cf0871

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 6486ae2..410965b 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -42,7 +42,6 @@
 import android.preference.PreferenceManager;
 import android.provider.ContactsContract.PhoneLookup;
 import android.provider.Settings;
-import android.telecom.DefaultDialerManager;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -165,7 +164,7 @@
                 (StatusBarManager) app.getSystemService(Context.STATUS_BAR_SERVICE);
         mUserManager = (UserManager) app.getSystemService(Context.USER_SERVICE);
         mSubscriptionManager = SubscriptionManager.from(mContext);
-        mTelecomManager = TelecomManager.from(mContext);
+        mTelecomManager = app.getSystemService(TelecomManager.class);
         mTelephonyManager = (TelephonyManager) app.getSystemService(Context.TELEPHONY_SERVICE);
     }
 
@@ -479,8 +478,8 @@
     }
 
     private Intent getShowVoicemailIntentForDefaultDialer(UserHandle userHandle) {
-        String dialerPackage = DefaultDialerManager
-                .getDefaultDialerApplication(mContext, userHandle.getIdentifier());
+        String dialerPackage = mContext.getSystemService(TelecomManager.class)
+                .getDefaultDialerPackage(userHandle.getIdentifier());
         return new Intent(TelephonyManager.ACTION_SHOW_VOICEMAIL_NOTIFICATION)
                 .setPackage(dialerPackage);
     }