commit 7b29ce88715a49fbad334b3f35d295026b33cf53
author Gil Cukierman <cukie@google.com> Tue Jan 31 17:51:24 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 17:51:24 2023 +0000
tree 750cfc1a2e1582c2260d6b5a437283cf20d0c4e2
parent c8561c377d7c8690db379c1bb1f806b83478e330
parent 2a8f48be5f938ea2a1c6059c1a8ef6bcd04a2c7d

Merge "Remove References to ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 709260c..d48d204 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6820,12 +6820,10 @@
         // any network types which were set for security reasons.
         if (mApp.checkCallingOrSelfPermission(Manifest.permission.MODIFY_PHONE_STATE)
                 != PERMISSION_GRANTED
-                && (reason == TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G
-                || reason == TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTIONS)) {
+                && reason == TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G) {
             throw new SecurityException(
                     "setAllowedNetworkTypesForReason cannot be called with carrier privileges for"
-                            + " reason "
-                            + reason);
+                            + " reason " + reason);
         }
         if (!TelephonyManager.isValidAllowedNetworkTypesReason(reason)) {
             loge("setAllowedNetworkTypesForReason: Invalid allowed network type reason: " + reason);