commit 5277fefdcd773e1135d6710cb03ad326f0fb0287
author Taesu Lee <taesu82.lee@samsung.com> Tue Oct 15 13:14:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 15 13:14:32 2019 -0700
tree 28200a94bb83ed37c58a798e1f69d8bc90f8b01f
parent 5e5b5e8137ba0516e301cc0c2c025336328f8847
parent 11cf73e0226b59e83c72bded72d98bdbf83d4854

Merge "Fix wrong log and import order in PhoneInterfaceManager" am: c41da93a4a am: f78c740f01 am: a908704f78
am: 11cf73e022

Change-Id: Ia66e31b893f2c723161df854d89ce25fe94e1eca

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 63d85a6..4d8f56a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2776,7 +2776,7 @@
             if (phone != null) {
                 phone.setDataActivationState(activationState);
             } else {
-                loge("setVoiceActivationState fails with invalid subId: " + subId);
+                loge("setDataActivationState fails with invalid subId: " + subId);
             }
         } finally {
             Binder.restoreCallingIdentity(identity);
@@ -4958,13 +4958,13 @@
     public int getCarrierPrivilegeStatusForUid(int subId, int uid) {
         final Phone phone = getPhone(subId);
         if (phone == null) {
-            loge("getCarrierPrivilegeStatus: Invalid subId");
+            loge("getCarrierPrivilegeStatusForUid: Invalid subId");
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
         }
         UiccProfile profile =
                 UiccController.getInstance().getUiccProfileForPhone(phone.getPhoneId());
         if (profile == null) {
-            loge("getCarrierPrivilegeStatus: No UICC");
+            loge("getCarrierPrivilegeStatusForUid: No UICC");
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
         }
         return getCarrierPrivilegeStatusFromCarrierConfigRules(
@@ -5020,7 +5020,7 @@
         }
         UiccCard card = UiccController.getInstance().getUiccCard(phoneId);
         if (card == null) {
-            loge("getCarrierPackageNamesForIntent: No UICC");
+            loge("getCarrierPackageNamesForIntentAndPhone: No UICC");
             return null ;
         }
         return card.getCarrierPackageNamesForIntent(mApp.getPackageManager(), intent);