commit d593d3b638eb9021a1b5bc3d646e131347d0ec8a
author SongFerng Wang <songferngwang@google.com> Sat Apr 17 06:17:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 17 06:17:20 2021 +0000
tree 03af02be29edbbd99ca05ed7f3b2a643f2f8b05e
parent 53ff4937b6e75cbbb4b035701845b944706f8053
parent e7794bc7a6f7b3b7f27a0ad80492cb6a2502ec46

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/14185463

Change-Id: I94cd53ba89911d4106f35b5c3361b63c38009492

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