diff options
| author | 2021-04-16 23:58:42 +0000 | |
|---|---|---|
| committer | 2021-04-16 23:58:42 +0000 | |
| commit | 7fa5d35a455d5467c68d37f4424412017fe6c37e (patch) | |
| tree | b3c072087bd5f95f434a9b0676da8def3e16f6e8 | |
| parent | ad6ad2644135478bf3de7f3335ac44e290d88b48 (diff) | |
| parent | f7e9c836c4eba08dec9ff25435604306e77b90a1 (diff) | |
Merge "Update documentation for setSubscriptionOverride" into sc-dev
| -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 ec83c4e8fa75..053856bc798f 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 d8ac08298530..2616ec8cc04f 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2785,7 +2785,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 @@ -2849,7 +2850,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 |