Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev (5385f5a0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,9 @@ public class CarrierConfigManager {
		* specific SIM card. If an invalid subId is used, the returned config will contain default
		* values.
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
		*
		* @param subId the subscription ID, normally obtained from {@link SubscriptionManager}.
		* @return A {@link PersistableBundle} containing the config for the given subId, or default
		* values for an invalid subId.
		@@ -452,6 +455,9 @@ public class CarrierConfigManager {
		/**
		* Gets the configuration values for the default subscription.
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
		*
		* @see #getConfigForSubId
		*/
		@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
		* moment.
		* </p>
		* <p>Requires that the calling app has carrier privileges.
		* @see #hasCarrierPrivileges
		* <p>
		* This method returns before the reload has completed, and
		* {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an