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

Commit 068a7ae9 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update documentation for setSubscriptionOverride" am: ab9f5d46 

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

Change-Id: I0979044ee12d9e4083df57870dad64c2370f7449
parents 0bd0d7e0 ab9f5d46

core/java/android/net/NetworkPolicyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -479,7 +479,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.

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

     *            network types are specified, override values will be ignored.

     *            {@see TelephonyManager#getAllNetworkTypes()}

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

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

telephony/java/android/telephony/SubscriptionManager.java

+4 −2
Original line number Diff line number Diff line
@@ -2765,7 +2765,8 @@ public class SubscriptionManager { 
     * @param subId the subscriber this override applies to.

     * @param overrideUnmetered set if the billing relationship should be

     *            considered unmetered.

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

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

     *            network types are specified, override values will be ignored.

     *            {@see TelephonyManager#getAllNetworkTypes()}

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

     *            be automatically cleared, or {@code 0} to leave in the
@@ -2829,7 +2830,8 @@ public class SubscriptionManager { 
     * @param subId the subscriber this override applies to.

     * @param overrideCongested set if the subscription should be considered

     *            congested.

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

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

     *            network types are specified, override values will be ignored.

     *            {@see TelephonyManager#getAllNetworkTypes()}

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

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