diff options
| author | 2021-06-14 19:30:48 +0000 | |
|---|---|---|
| committer | 2021-06-14 19:30:48 +0000 | |
| commit | ab9f5d46b277a68ab857838b0a461e4345e0aeec (patch) | |
| tree | 3e55b5421548858d65054d3889da9a6de0b66faa | |
| parent | 6fe0c8ea309036913752ad626ff9c686c42ce03f (diff) | |
| parent | 2aaa2c32053497446327157255de56e4123f41fb (diff) | |
Merge "Update documentation for setSubscriptionOverride"
| -rw-r--r-- | core/java/android/net/NetworkPolicyManager.java | 3 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index c1cd09e5f531..12c571f5eed9 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -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 diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 06a2648f3bf6..9d4db173d165 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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 |