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

Commit 3cde1b28 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3dc22a55c1de4b51927499d1d33b1aa66b8a752
parents 5996679b 1c600eed

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -41213,7 +41213,9 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void removeSubscriptionsFromGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunistic(boolean, int);

    method public void setSubscriptionOverrideCongested(int, boolean, long);

    method public void setSubscriptionOverrideCongested(int, boolean, @NonNull int[], long);

    method public void setSubscriptionOverrideUnmetered(int, boolean, long);

    method public void setSubscriptionOverrideUnmetered(int, boolean, @NonNull int[], long);

    method public void setSubscriptionPlans(int, @NonNull java.util.List<android.telephony.SubscriptionPlan>);

    method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, @NonNull android.app.PendingIntent);

    field public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";

core/java/android/net/INetworkPolicyListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ oneway interface INetworkPolicyListener { 
    void onMeteredIfacesChanged(in String[] meteredIfaces);

    void onRestrictBackgroundChanged(boolean restrictBackground);

    void onUidPoliciesChanged(int uid, int uidPolicies);

    void onSubscriptionOverride(int subId, int overrideMask, int overrideValue);

    void onSubscriptionOverride(int subId, int overrideMask, int overrideValue, in int[] networkTypes);

    void onSubscriptionPlansChanged(int subId, in SubscriptionPlan[] plans);

}

core/java/android/net/INetworkPolicyManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ interface INetworkPolicyManager { 
    SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage);

    void setSubscriptionPlans(int subId, in SubscriptionPlan[] plans, String callingPackage);

    String getSubscriptionPlansOwner(int subId);

    void setSubscriptionOverride(int subId, int overrideMask, int overrideValue, long timeoutMillis, String callingPackage);

    void setSubscriptionOverride(int subId, int overrideMask, int overrideValue, in int[] networkTypes, long timeoutMillis, String callingPackage);



    void factoryReset(String subscriber);

core/java/android/net/NetworkPolicyManager.java

+13 −8
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.net.wifi.WifiInfo; 
import android.os.Build;

import android.os.Process;

import android.os.RemoteException;

import android.telephony.Annotation;

import android.telephony.SubscriptionPlan;

import android.util.DebugUtils;

import android.util.Pair;
@@ -377,6 +378,8 @@ public class NetworkPolicyManager { 
     * @param overrideMask the bitmask that specifies which of the overrides is being

     *            set or cleared.

     * @param overrideValue the override values to set or clear.

     * @param networkTypes the network types this override applies to.

     *            {@see TelephonyManager#getAllNetworkTypes()}

     * @param timeoutMillis the timeout after which the requested override will

     *            be automatically cleared, or {@code 0} to leave in the

     *            requested state until explicitly cleared, or the next reboot,
@@ -385,11 +388,12 @@ public class NetworkPolicyManager { 
     * @hide

     */

    public void setSubscriptionOverride(int subId, @SubscriptionOverrideMask int overrideMask,

            @SubscriptionOverrideMask int overrideValue, long timeoutMillis,

            @SubscriptionOverrideMask int overrideValue,

            @NonNull @Annotation.NetworkType int[] networkTypes, long timeoutMillis,

            @NonNull String callingPackage) {

        try {

            mService.setSubscriptionOverride(subId, overrideMask, overrideValue, timeoutMillis,

                    callingPackage);

            mService.setSubscriptionOverride(subId, overrideMask, overrideValue, networkTypes,

                    timeoutMillis, callingPackage);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -613,9 +617,10 @@ public class NetworkPolicyManager { 
         * @param subId the subscriber this override applies to.

         * @param overrideMask a bitmask that specifies which of the overrides is set.

         * @param overrideValue a bitmask that specifies the override values.

         * @param networkTypes the network types this override applies to.

         */

        public void onSubscriptionOverride(int subId, @SubscriptionOverrideMask int overrideMask,

                @SubscriptionOverrideMask int overrideValue) {}

                @SubscriptionOverrideMask int overrideValue, int[] networkTypes) {}



        /**

         * Notify of subscription plans change about a given subscription.
@@ -639,8 +644,8 @@ public class NetworkPolicyManager { 


        @Override

        public void onSubscriptionOverride(int subId, @SubscriptionOverrideMask int overrideMask,

                @SubscriptionOverrideMask int overrideValue) {

            mCallback.onSubscriptionOverride(subId, overrideMask, overrideValue);

                @SubscriptionOverrideMask int overrideValue, int[] networkTypes) {

            mCallback.onSubscriptionOverride(subId, overrideMask, overrideValue, networkTypes);

        }



        @Override
@@ -656,7 +661,7 @@ public class NetworkPolicyManager { 
        @Override public void onRestrictBackgroundChanged(boolean restrictBackground) { }

        @Override public void onUidPoliciesChanged(int uid, int uidPolicies) { }

        @Override public void onSubscriptionOverride(int subId, int overrideMask,

                int overrideValue) { }

                int overrideValue, int[] networkTypes) { }

        @Override public void onSubscriptionPlansChanged(int subId, SubscriptionPlan[] plans) { }

    }

}

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

+37 −13
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import static android.net.NetworkPolicyManager.RULE_REJECT_ALL; 
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;

import static android.net.NetworkPolicyManager.RULE_REJECT_RESTRICTED_MODE;

import static android.net.NetworkPolicyManager.RULE_TEMPORARY_ALLOW_METERED;

import static android.net.NetworkPolicyManager.SUBSCRIPTION_OVERRIDE_UNMETERED;

import static android.net.NetworkPolicyManager.isProcStateAllowedWhileIdleOrPowerSaveMode;

import static android.net.NetworkPolicyManager.isProcStateAllowedWhileOnRestrictBackground;

import static android.net.NetworkPolicyManager.resolveNetworkId;
@@ -231,6 +232,7 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;

import com.android.internal.notification.SystemNotificationChannels;

import com.android.internal.os.SomeArgs;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.CollectionUtils;

import com.android.internal.util.ConcurrentUtils;
@@ -3488,13 +3490,27 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 


    @Override

    public void setSubscriptionOverride(int subId, int overrideMask, int overrideValue,

            long timeoutMillis, String callingPackage) {

            int[] networkTypes, long timeoutMillis, String callingPackage) {

        enforceSubscriptionPlanAccess(subId, Binder.getCallingUid(), callingPackage);



        // We can only override when carrier told us about plans

        final ArraySet<Integer> allNetworksSet = new ArraySet<>();

        addAll(allNetworksSet, TelephonyManager.getAllNetworkTypes());

        final IntArray applicableNetworks = new IntArray();



        // ensure all network types are valid

        for (int networkType : networkTypes) {

            if (allNetworksSet.contains(networkType)) {

                applicableNetworks.add(networkType);

            } else {

                Log.d(TAG, "setSubscriptionOverride removing invalid network type: " + networkType);

            }

        }



        // We can only override when carrier told us about plans. For the unmetered case,

        // allow override without having plans defined.

        synchronized (mNetworkPoliciesSecondLock) {

            final SubscriptionPlan plan = getPrimarySubscriptionPlanLocked(subId);

            if (plan == null

            if (overrideMask != SUBSCRIPTION_OVERRIDE_UNMETERED && plan == null

                    || plan.getDataLimitBehavior() == SubscriptionPlan.LIMIT_BEHAVIOR_UNKNOWN) {

                throw new IllegalStateException(

                        "Must provide valid SubscriptionPlan to enable overriding");
@@ -3506,11 +3522,16 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        final boolean overrideEnabled = Settings.Global.getInt(mContext.getContentResolver(),

                NETPOLICY_OVERRIDE_ENABLED, 1) != 0;

        if (overrideEnabled || overrideValue == 0) {

            mHandler.sendMessage(mHandler.obtainMessage(MSG_SUBSCRIPTION_OVERRIDE,

                    overrideMask, overrideValue, subId));

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = subId;

            args.arg2 = overrideMask;

            args.arg3 = overrideValue;

            args.arg4 = applicableNetworks.toArray();

            mHandler.sendMessage(mHandler.obtainMessage(MSG_SUBSCRIPTION_OVERRIDE, args));

            if (timeoutMillis > 0) {

                mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SUBSCRIPTION_OVERRIDE,

                        overrideMask, 0, subId), timeoutMillis);

                args.arg3 = 0;

                mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SUBSCRIPTION_OVERRIDE, args),

                        timeoutMillis);

            }

        }

    }
@@ -4778,10 +4799,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    }



    private void dispatchSubscriptionOverride(INetworkPolicyListener listener, int subId,

            int overrideMask, int overrideValue) {

            int overrideMask, int overrideValue, int[] networkTypes) {

        if (listener != null) {

            try {

                listener.onSubscriptionOverride(subId, overrideMask, overrideValue);

                listener.onSubscriptionOverride(subId, overrideMask, overrideValue, networkTypes);

            } catch (RemoteException ignored) {

            }

        }
@@ -4913,13 +4934,16 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                    return true;

                }

                case MSG_SUBSCRIPTION_OVERRIDE: {

                    final int overrideMask = msg.arg1;

                    final int overrideValue = msg.arg2;

                    final int subId = (int) msg.obj;

                    final SomeArgs args = (SomeArgs) msg.obj;

                    final int subId = (int) args.arg1;

                    final int overrideMask = (int) args.arg2;

                    final int overrideValue = (int) args.arg3;

                    final int[] networkTypes = (int[]) args.arg4;

                    final int length = mListeners.beginBroadcast();

                    for (int i = 0; i < length; i++) {

                        final INetworkPolicyListener listener = mListeners.getBroadcastItem(i);

                        dispatchSubscriptionOverride(listener, subId, overrideMask, overrideValue);

                        dispatchSubscriptionOverride(listener, subId, overrideMask, overrideValue,

                                networkTypes);

                    }

                    mListeners.finishBroadcast();

                    return true;