commit 5b49433d512b2bec78592260e2f2e2f141b2bd6c
author Jack Yu <jackyu@google.com> Mon Jan 23 18:18:04 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 23 18:18:04 2023 +0000
tree 496618eb879e19dbb30de105b16abc56badd1219
parent 95e933d3f7a4228dce4c6c8b675f54785a28a37f

Revert "Fixed the set/getAllowedNetworkTypes debug messages"

This reverts commit 95e933d3f7a4228dce4c6c8b675f54785a28a37f.

Reason for revert: b/266431114

Change-Id: I0c9290d583a90c4f0790892725bc8faeb2fd15c6

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8b82675..ccef4d8 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6818,11 +6818,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)) {
@@ -6830,10 +6829,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) {
@@ -6841,9 +6838,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;
         }