summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Malcolm Chen <refuhoo@google.com> 2019-09-25 14:02:14 -0700
committer Malcolm Chen <refuhoo@google.com> 2019-09-25 14:02:14 -0700
commit2c95aa9b5a9d90127fb525bf29615eb6232db83e (patch)
treeaa9eb71ade9c743d20ea02e3546a7f5c193dd97a
parent4e13461ef96281c2fabfbc29a8a8c609d629c039 (diff)
Allow notifyCarrierNetworkChange on grouped oppt subscriptions.
Replace getActiveSubscriptionIdList with getActiveSubscriptionIdList(false) so that grouped opportuistic subscriptions will also be included. Bug: 141568415 Test: manual - using test app Change-Id: Idd48da2948013e00393819fcf22b6ede509c2f0c
-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 eb2723a2c7d5..0b46bf4e5eaa 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1190,7 +1190,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");