From 1eb939c90fc409708dbca99d6652a44fea048cb8 Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Wed, 25 Sep 2019 14:02:14 -0700
Subject: [PATCH] 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
Merged-In: Idd48da2948013e00393819fcf22b6ede509c2f0c
---
 services/core/java/com/android/server/TelephonyRegistry.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index ca746ca16c5a6..52eb45f819f16 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1204,7 +1204,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");