commit c2d3ccc991a8e127dc807cb644872e5aae8c01d9
author SongFerngWang <songferngwang@google.com> Thu Apr 15 19:46:33 2021 +0800
committer SongFerng Wang <songferngwang@google.com> Fri Jul 02 09:38:21 2021 +0000
tree b8f58e94cb56ca894e7cf432f9da00d0b71538d4
parent 7b5b7d44e92bcc1f582c92d4ea9185bcadd0849a

Add the subId chceking before the DB write allowed network type

Bug: 185264531
Test: Build pass.
Change-Id: Ibcb1f7662e25570e5091b229142f73ac7aec8288
Merged-In: Ibcb1f7662e25570e5091b229142f73ac7aec8288

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8d946f5..a09c6ad 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6214,7 +6214,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;
         }