Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions."

am: 7d099030de

Change-Id: Icf628cf39c8690d486741a4610cf3ea610e3d490
This commit is contained in:
Xiangyu/Malcolm Chen
2019-10-14 21:58:40 -07:00
committed by android-build-merger

View File

@@ -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");