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

Commit 3a853c86 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc of the newly introduced CarrirConfigManager APIs" am:... 

Merge "Update javadoc of the newly introduced CarrirConfigManager APIs" am: 756cf625 am: c7bed085

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



Change-Id: I894de000b1de8228ed5229b1750aa22de972c9f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ee3891c c7bed085

telephony/java/android/telephony/CarrierConfigManager.java

+6 −3
Original line number Diff line number Diff line
@@ -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.