commit e7794bc7a6f7b3b7f27a0ad80492cb6a2502ec46
author SongFerng Wang <songferngwang@google.com> Sat Apr 17 05:54:33 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 17 05:54:33 2021 +0000
tree 5f9e9561a36d77b816c6894861512deab8793152
parent a7b4cb5b616f00dfbbad910ae8228ad9dc424b77
parent 7ffc273a0adeff036e616f989dad7fdb2e9e5bd6

Merge "Add the subId chceking before the DB write allowed network type" into sc-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4632e56..a97f4f1 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6341,7 +6341,11 @@
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setAllowedNetworkTypesForReason");
         if (!TelephonyManager.isValidAllowedNetworkTypesReason(reason)) {
-            Rlog.e(LOG_TAG, "Invalid allowed network type reason: " + reason);
+            loge("setAllowedNetworkTypesForReason: Invalid allowed network type reason: " + reason);
+            return false;
+        }
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
+            loge("setAllowedNetworkTypesForReason: Invalid subscriptionId:" + subId);
             return false;
         }