summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Xiangyu/Malcolm Chen <refuhoo@google.com> 2019-09-26 22:38:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-09-26 22:38:18 +0000
commit46fa5ee2efbaf437e5eb21969c361602c4c60e04 (patch)
treeee619f3080ffe1f5ee01c7b037c7eac6a0eb8489
parent49c727fe9099059b678b47aea0a2417cd8cf3fe2 (diff)
parent2c95aa9b5a9d90127fb525bf29615eb6232db83e (diff)
Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions."
-rw-r--r--services/core/java/com/android/server/TelephonyRegistry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index c412ebdc9033..5947c3599ca8 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1193,7 +1193,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
public void notifyCarrierNetworkChange(boolean active) {
// only CarrierService with carrier privilege rule should have the permission
int[] subIds = Arrays.stream(SubscriptionManager.from(mContext)
- .getActiveSubscriptionIdList())
+ .getActiveSubscriptionIdList(false))
.filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(i)).toArray();
if (ArrayUtils.isEmpty(subIds)) {
loge("notifyCarrierNetworkChange without carrier privilege");