From f7e9c836c4eba08dec9ff25435604306e77b90a1 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Thu, 15 Apr 2021 19:40:25 -0700 Subject: [PATCH] Update documentation for setSubscriptionOverride Test: build Fix: 180496714 Change-Id: Iebfcd0ece1891c1b77d132b92e93d8c1eea3aa6e --- core/java/android/net/NetworkPolicyManager.java | 3 ++- 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 ec83c4e8fa752..053856bc798f8 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 d8ac082985306..2616ec8cc04f6 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