commit 48a7ef15cd30f1ee66347ad5f492be93472e106c
author SongFerng Wang <songferngwang@google.com> Tue Jul 20 14:07:04 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 20 14:07:04 2021 +0000
tree c8957bab70dd225bc7a4bd403e37ecf265eb038a
parent b8f1dffd742132b7dee07be17b6a092dca557e79
parent c2d3ccc991a8e127dc807cb644872e5aae8c01d9

Merge "Add the subId chceking before the DB write allowed network type"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fa52f48..958c860 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;
         }