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

Commit 82006852 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Obtain NPMS through helper method. am: a435ab51 

am: bfbae60f

Change-Id: I4278f93601da7f6ae580ae562b5ff8e86baf6abe
parents f219fcf8 bfbae60f

telephony/java/android/telephony/SubscriptionManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -505,7 +505,7 @@ public class SubscriptionManager { 
    public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";

    public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";





    private final Context mContext;

    private final Context mContext;

    private INetworkPolicyManager mNetworkPolicy;

    private volatile INetworkPolicyManager mNetworkPolicy;





    /**

    /**

     * A listener class for monitoring changes to {@link SubscriptionInfo} records.

     * A listener class for monitoring changes to {@link SubscriptionInfo} records.
@@ -1794,7 +1794,7 @@ public class SubscriptionManager { 
            @DurationMillisLong long timeoutMillis) {

            @DurationMillisLong long timeoutMillis) {

        try {

        try {

            final int overrideValue = overrideUnmetered ? OVERRIDE_UNMETERED : 0;

            final int overrideValue = overrideUnmetered ? OVERRIDE_UNMETERED : 0;

            mNetworkPolicy.setSubscriptionOverride(subId, OVERRIDE_UNMETERED, overrideValue,

            getNetworkPolicy().setSubscriptionOverride(subId, OVERRIDE_UNMETERED, overrideValue,

                    timeoutMillis, mContext.getOpPackageName());

                    timeoutMillis, mContext.getOpPackageName());

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();
@@ -1828,7 +1828,7 @@ public class SubscriptionManager { 
            @DurationMillisLong long timeoutMillis) {

            @DurationMillisLong long timeoutMillis) {

        try {

        try {

            final int overrideValue = overrideCongested ? OVERRIDE_CONGESTED : 0;

            final int overrideValue = overrideCongested ? OVERRIDE_CONGESTED : 0;

            mNetworkPolicy.setSubscriptionOverride(subId, OVERRIDE_CONGESTED, overrideValue,

            getNetworkPolicy().setSubscriptionOverride(subId, OVERRIDE_CONGESTED, overrideValue,

                    timeoutMillis, mContext.getOpPackageName());

                    timeoutMillis, mContext.getOpPackageName());

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();