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;
         }
 
