Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b4fed76 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." am:... 

Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions." am: 7d099030 am: 6270ac25
am: f0fd3492

Change-Id: I0ba766329f91e28782feadf2c99fb973f188854a
parents fe418b9d f0fd3492

services/core/java/com/android/server/TelephonyRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -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");