diff options
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index ac584e9571fc..af78b769ce8c 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -1172,7 +1172,11 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { .filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i)) .findFirst().getAsInt(); } catch (NoSuchElementException ex) { - log("notifyCarrierNetworkChange without carrier privilege"); + loge("notifyCarrierNetworkChange without carrier privilege"); + } + // the active subId does not have carrier privilege. + if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + throw new SecurityException("notifyCarrierNetworkChange without carrier privilege"); } int phoneId = SubscriptionManager.getPhoneId(subId); @@ -2272,6 +2276,10 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { Rlog.d(TAG, s); } + private static void loge(String s) { + Rlog.e(TAG, s); + } + boolean idMatch(int rSubId, int subId, int phoneId) { if(subId < 0) { |