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

Commit c3f70418 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

Remove usage of @hide @Deprecated Telephony API in NPMS 

Bug: 140908357
Test: build and unittest
Change-Id: I33ce53a8f6156f77c09a5562382e39f14c45bc78
Merged-In: I33ce53a8f6156f77c09a5562382e39f14c45bc78
parent a4f2522c

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+4 −3
Original line number Diff line number Diff line
@@ -3038,12 +3038,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        // Verify they're not lying about package name

        mAppOps.checkPackage(callingUid, callingPackage);



        final SubscriptionManager sm;

        final SubscriptionInfo si;

        final PersistableBundle config;

        final long token = Binder.clearCallingIdentity();

        try {

            si = mContext.getSystemService(SubscriptionManager.class)

                    .getActiveSubscriptionInfo(subId);

            sm = mContext.getSystemService(SubscriptionManager.class);

            si = sm.getActiveSubscriptionInfo(subId);

            config = mCarrierConfigManager.getConfigForSubId(subId);

        } finally {

            Binder.restoreCallingIdentity(token);
@@ -3051,7 +3052,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


        // First check: is caller the CarrierService?

        if (si != null) {

            if (si.isEmbedded() && si.canManageSubscription(mContext, callingPackage)) {

            if (si.isEmbedded() && sm.canManageSubscription(si, callingPackage)) {

                return;

            }

        }