commit 95e933d3f7a4228dce4c6c8b675f54785a28a37f
author Jack Yu <jackyu@google.com> Sat Jan 14 12:42:30 2023 -0800
committer Jack Yu <jackyu@google.com> Thu Jan 19 14:57:18 2023 -0800
tree ce117e1eaf08fb38050f7f1bc5b68d911371fdf7
parent 2b771efea81c091db9e0e3fe5c20a671f1e6e8f4

Fixed the set/getAllowedNetworkTypes debug messages

Made the debug message more readable.

Fix: 265535191
Test: Manual
Change-Id: Ia590def5c4ec55e15cdd4d16f3ec54a650b41dc1

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ccef4d8..8b82675 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6818,10 +6818,11 @@
             throw new SecurityException(
                     "setAllowedNetworkTypesForReason cannot be called with carrier privileges for"
                             + " reason "
-                            + reason);
+                            + TelephonyManager.allowedNetworkTypesReasonToString(reason));
         }
         if (!TelephonyManager.isValidAllowedNetworkTypesReason(reason)) {
-            loge("setAllowedNetworkTypesForReason: Invalid allowed network type reason: " + reason);
+            loge("setAllowedNetworkTypesForReason: Invalid allowed network type reason: "
+                    + TelephonyManager.allowedNetworkTypesReasonToString(reason));
             return false;
         }
         if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
@@ -6829,8 +6830,10 @@
             return false;
         }
 
-        log("setAllowedNetworkTypesForReason: subId=" + subId + ", reason=" + reason + " value: "
-                + TelephonyManager.convertNetworkTypeBitmaskToString(allowedNetworkTypes));
+        log("setAllowedNetworkTypesForReason: subId=" + subId + ", reason="
+                + TelephonyManager.allowedNetworkTypesReasonToString(reason) + ", network types: "
+                + TelephonyManager.convertNetworkTypeBitmaskToString(allowedNetworkTypes)
+                + ", callingPackage=" + getCurrentPackageName());
 
         Phone phone = getPhone(subId);
         if (phone == null) {
@@ -6838,7 +6841,9 @@
         }
 
         if (allowedNetworkTypes == phone.getAllowedNetworkTypes(reason)) {
-            log("setAllowedNetworkTypesForReason: " + reason + "does not change value");
+            log("setAllowedNetworkTypesForReason: "
+                    + TelephonyManager.allowedNetworkTypesReasonToString(reason)
+                    + " already has the specified network types.");
             return true;
         }