summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rambo Wang <rambowang@google.com> 2023-03-09 22:28:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-09 22:28:49 +0000
commitc7bed0856fc7c24c735d19d8696bae9875551acf (patch)
treedcbb1ff467b50ea98e35e8e2b6142f2f47258f65
parentefe8939400ad91a2df7f1a6654fe2a103182b9af (diff)
parent756cf6254c93705e8cd9ccee62e5c883cdd04ba5 (diff)
Merge "Update javadoc of the newly introduced CarrirConfigManager APIs" am: 756cf6254c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2478139 Change-Id: I16de3cfc91b33ce373a1dccd46d84d46cc2291b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 5925c889235f..c175fc635e5c 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -9389,7 +9389,8 @@ public class CarrierConfigManager {
* Gets the configuration values of the specified keys for a particular subscription.
*
* <p>If an invalid subId is used, the returned configuration will contain default values for
- * the specified keys.
+ * the specified keys. If the value for the key can't be found, the returned configuration will
+ * filter the key out.
*
* <p>After using this method to get the configuration bundle,
* {@link #isConfigForIdentifiedCarrier(PersistableBundle)} should be called to confirm whether
@@ -9407,8 +9408,8 @@ public class CarrierConfigManager {
* @param subId The subscription ID on which the carrier config should be retrieved.
* @param keys The carrier config keys to retrieve values.
* @return A {@link PersistableBundle} with key/value mapping for the specified configuration
- * on success, or an empty (but never null) bundle on failure (for example, when no value for
- * the specified key can be found).
+ * on success, or an empty (but never null) bundle on failure (for example, when the calling app
+ * has no permission).
*/
@RequiresPermission(anyOf = {
Manifest.permission.READ_PHONE_STATE,
@@ -9526,6 +9527,8 @@ public class CarrierConfigManager {
* Gets the configuration values of the specified config keys applied for the default
* subscription.
*
+ * <p>If the value for the key can't be found, the returned bundle will filter the key out.
+ *
* <p>After using this method to get the configuration bundle, {@link
* #isConfigForIdentifiedCarrier(PersistableBundle)} should be called to confirm whether any
* carrier specific configuration has been applied.