commit ba535d07cb1ac841344889935cdcf2ff0f2b602f
author Jack Yu <jackyu@google.com> Wed Jan 18 19:26:51 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 19:26:51 2023 +0000
tree e36241dd755c6d54213e9dd4728836d4efd98c1d
parent 363462b0788d290d22b45914db7ed05c342c9c73

Revert "Fixed the set/getAllowedNetworkTypes debug messages"

This reverts commit 363462b0788d290d22b45914db7ed05c342c9c73.

Reason for revert: b/265950512

Change-Id: Iaba241631f334ffc2923fb8d169a81a4e3c7381a

src/com/android/phone/PhoneInterfaceManager.java

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