Merge "Fixed the set/getAllowedNetworkTypes debug messages"
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9c77ba5..61f38d8 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6729,10 +6729,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)) {
@@ -6740,8 +6741,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) {
@@ -6749,7 +6752,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;
}