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

am 5385f5a0: Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev

Browse Source 
* commit '5385f5a0b8b22a06a3befd5b660676dc04336a5f':
  Add comments to carrierconfigmanager for required permission.
This commit is contained in:
Junda Liu
2015-06-19 20:36:46 +00:00
committed by Android Git Automerger
parent 44caca3c45 5385f5a0b8
commit cce3cdff5b
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,6 +431,9 @@ public class CarrierConfigManager {
* 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.
* *
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*
* @param subId the subscription ID, normally obtained from {@link SubscriptionManager}. * @param subId the subscription ID, normally obtained from {@link SubscriptionManager}.
* @return A {@link PersistableBundle} containing the config for the given subId, or default * @return A {@link PersistableBundle} containing the config for the given subId, or default
* values for an invalid subId. * values for an invalid subId.
@@ -452,6 +455,9 @@ public class CarrierConfigManager {
/** /**
* Gets the configuration values for the default subscription. * Gets the configuration values for the default subscription.
* *
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*
* @see #getConfigForSubId * @see #getConfigForSubId
*/ */
@Nullable @Nullable
@@ -466,6 +472,8 @@ public class CarrierConfigManager {
* This should be called by a carrier service app if it wants to update config at an arbitrary * This should be called by a carrier service app if it wants to update config at an arbitrary
* moment. * moment.
* </p> * </p>
* <p>Requires that the calling app has carrier privileges.
* @see #hasCarrierPrivileges
* <p> * <p>
* This method returns before the reload has completed, and * This method returns before the reload has completed, and
* {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an