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

Commit 7e963605 authored by Aaron Huang's avatar Aaron Huang Committed by Chalard Jean
Browse files

Use Context.NETWORK_POLICY_SERVICE to get network policy service 

INetworkPolicyManager is a raw AIDL file which won't expose
as system API. Let's communicate with network policy service
through NetworkPolicyManager instead. Context.NETWORK_POLICY_SERVICE
is @SystemApi.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I41bc1cce08f81e2d822250f2d620bff7afe4329b
parent 58d95593

telephony/java/android/telephony/SubscriptionManager.java

+21 −30
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.content.res.Resources; 
import android.database.ContentObserver;

import android.net.INetworkPolicyManager;

import android.net.NetworkCapabilities;

import android.net.NetworkPolicyManager;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;
@@ -957,6 +958,11 @@ public class SubscriptionManager { 
        mContext = context;

    }



    private NetworkPolicyManager getNetworkPolicyManager() {

        return (NetworkPolicyManager) mContext

                .getSystemService(Context.NETWORK_POLICY_SERVICE);

    }



    /**

     * @deprecated developers should always obtain references directly from

     *             {@link Context#getSystemService(Class)}.
@@ -967,7 +973,7 @@ public class SubscriptionManager { 
                .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);

    }



    private final INetworkPolicyManager getNetworkPolicy() {

    private INetworkPolicyManager getINetworkPolicyManager() {

        if (mNetworkPolicy == null) {

            mNetworkPolicy = INetworkPolicyManager.Stub.asInterface(

                    TelephonyFrameworkInitializer
@@ -2587,14 +2593,10 @@ public class SubscriptionManager { 
     *             outlined above.

     */

    public @NonNull List<SubscriptionPlan> getSubscriptionPlans(int subId) {

        try {

        SubscriptionPlan[] subscriptionPlans =

                    getNetworkPolicy().getSubscriptionPlans(subId, mContext.getOpPackageName());

                getNetworkPolicyManager().getSubscriptionPlans(subId, mContext.getOpPackageName());

        return subscriptionPlans == null

                ? Collections.emptyList() : Arrays.asList(subscriptionPlans);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**
@@ -2620,18 +2622,14 @@ public class SubscriptionManager { 
     *             defined in {@link SubscriptionPlan}.

     */

    public void setSubscriptionPlans(int subId, @NonNull List<SubscriptionPlan> plans) {

        try {

            getNetworkPolicy().setSubscriptionPlans(subId,

        getNetworkPolicyManager().setSubscriptionPlans(subId,

                plans.toArray(new SubscriptionPlan[plans.size()]), mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /** @hide */

    private String getSubscriptionPlansOwner(int subId) {

        try {

            return getNetworkPolicy().getSubscriptionPlansOwner(subId);

            return getINetworkPolicyManager().getSubscriptionPlansOwner(subId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -2662,13 +2660,10 @@ public class SubscriptionManager { 
     */

    public void setSubscriptionOverrideUnmetered(int subId, boolean overrideUnmetered,

            @DurationMillisLong long timeoutMillis) {

        try {



        final int overrideValue = overrideUnmetered ? SUBSCRIPTION_OVERRIDE_UNMETERED : 0;

            getNetworkPolicy().setSubscriptionOverride(subId, SUBSCRIPTION_OVERRIDE_UNMETERED,

        getNetworkPolicyManager().setSubscriptionOverride(subId, SUBSCRIPTION_OVERRIDE_UNMETERED,

                overrideValue, timeoutMillis, mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**
@@ -2697,13 +2692,9 @@ public class SubscriptionManager { 
     */

    public void setSubscriptionOverrideCongested(int subId, boolean overrideCongested,

            @DurationMillisLong long timeoutMillis) {

        try {

        final int overrideValue = overrideCongested ? SUBSCRIPTION_OVERRIDE_CONGESTED : 0;

            getNetworkPolicy().setSubscriptionOverride(subId, SUBSCRIPTION_OVERRIDE_CONGESTED,

        getNetworkPolicyManager().setSubscriptionOverride(subId, SUBSCRIPTION_OVERRIDE_CONGESTED,

                overrideValue, timeoutMillis, mContext.getOpPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**