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

Commit 7d099030 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Allow notifyCarrierNetworkChange on grouped oppt subscriptions."

parents 1656b2b2 1eb939c9

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