Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more comments for the isConfigForIdentifiedCarrier()" am: ec76adb9ff

Browse Source 
am: 3b84db2329

Change-Id: I2a9bd2d3b691418debf601b869049e7df090c3a8
This commit is contained in:
Ying Xu
2018-03-22 20:40:10 +00:00
committed by android-build-merger
parent 99fe3a8497 3b84db2329
commit a8be468657
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2227,7 +2227,9 @@ public class CarrierConfigManager {
/** /**
* Gets the configuration values for a particular subscription, which is associated with a * Gets the configuration values for a particular subscription, which is associated with a
* specific SIM card. If an invalid subId is used, the returned config will contain default * specific SIM card. If an invalid subId is used, the returned config will contain default
* values. * values. 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.
* *
* <p>Requires Permission: * <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
@@ -2254,7 +2256,9 @@ public class CarrierConfigManager {
} }
/** /**
* Gets the configuration values for the default subscription. * Gets the configuration values for the default subscription. 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.
* *
* <p>Requires Permission: * <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
@@ -2283,6 +2287,9 @@ public class CarrierConfigManager {
* <p> * <p>
* After using {@link #getConfig()} or {@link #getConfigForSubId(int)} an app should always * After using {@link #getConfig()} or {@link #getConfigForSubId(int)} an app should always
* use this method to confirm whether any carrier specific configuration has been applied. * use this method to confirm whether any carrier specific configuration has been applied.
* Especially when an app misses the broadcast {@link #ACTION_CARRIER_CONFIG_CHANGED} but it
* still needs to get the current configuration, it must use this method to verify whether the
* configuration is default or carrier overridden.
* </p> * </p>
* *
* @param bundle the configuration bundle to be checked. * @param bundle the configuration bundle to be checked.