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/PhoneUtils.java

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 6c3f0bf..d4fe450 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -31,6 +31,7 @@
 import android.telecom.VideoProfile;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.Rlog;
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -299,7 +300,7 @@
                                           MmiCode mmiCode,
                                           Message buttonCallbackMessage,
                                           Dialog previousAlert) {
-        log("displayMMIInitiate: " + android.telecom.Log.pii(mmiCode.toString()));
+        log("displayMMIInitiate: " + Rlog.pii(LOG_TAG, mmiCode.toString()));
         if (previousAlert != null) {
             previousAlert.dismiss();
         }