Merge "Change APIs related to carrier actions." am: b430d57705 am: 0ef137bb81 (f0225870) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -8879,9 +8879,6 @@ package android.telephony {

		public class TelephonyManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void carrierActionReportDefaultNetworkStatus(int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void carrierActionResetAll(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void carrierActionSetRadioEnabled(int, boolean);
		method public int checkCarrierPrivilegesForPackage(String);
		method public int checkCarrierPrivilegesForPackageAnyPhone(String);
		method public void dial(String);
		@@ -8952,8 +8949,10 @@ package android.telephony {
		method public boolean needsOtaServiceProvisioning();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void requestNumberVerification(@NonNull android.telephony.PhoneNumberRange, long, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.NumberVerificationCallback);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetAllCarrierActions();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void resetCarrierKeysForImsiEncryption();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean resetRadioConfig();
		method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();
		@@ -8967,6 +8966,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRadioEnabled(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerState(int);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerStateForSlot(int, int);

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.telephony.PhoneConstants;

		/**
		@@ -138,7 +139,7 @@ public class CarrierActionUtils {
		SubscriptionManager.getDefaultVoiceSubscriptionId());
		logd("onRegisterDefaultNetworkAvail subId: " + subId);
		final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
		telephonyMgr.carrierActionReportDefaultNetworkStatus(subId, true);
		telephonyMgr.createForSubscriptionId(subId).reportDefaultNetworkStatus(true);
		}

		private static void onDeregisterDefaultNetworkAvail(Intent intent, Context context) {
		@@ -146,7 +147,7 @@ public class CarrierActionUtils {
		SubscriptionManager.getDefaultVoiceSubscriptionId());
		logd("onDeregisterDefaultNetworkAvail subId: " + subId);
		final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
		telephonyMgr.carrierActionReportDefaultNetworkStatus(subId, false);
		telephonyMgr.createForSubscriptionId(subId).reportDefaultNetworkStatus(false);
		}

		private static void onDisableRadio(Intent intent, Context context) {
		@@ -154,7 +155,7 @@ public class CarrierActionUtils {
		SubscriptionManager.getDefaultVoiceSubscriptionId());
		logd("onDisableRadio subId: " + subId);
		final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
		telephonyMgr.carrierActionSetRadioEnabled(subId, !ENABLE);
		telephonyMgr.createForSubscriptionId(subId).setRadioEnabled(!ENABLE);
		}

		private static void onEnableRadio(Intent intent, Context context) {
		@@ -162,7 +163,7 @@ public class CarrierActionUtils {
		SubscriptionManager.getDefaultVoiceSubscriptionId());
		logd("onEnableRadio subId: " + subId);
		final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
		telephonyMgr.carrierActionSetRadioEnabled(subId, ENABLE);
		telephonyMgr.createForSubscriptionId(subId).setRadioEnabled(ENABLE);
		}

		private static void onShowCaptivePortalNotification(Intent intent, Context context) {
		@@ -205,7 +206,7 @@ public class CarrierActionUtils {
		SubscriptionManager.getDefaultVoiceSubscriptionId());
		logd("onResetAllCarrierActions subId: " + subId);
		final TelephonyManager telephonyMgr = context.getSystemService(TelephonyManager.class);
		telephonyMgr.carrierActionResetAll(subId);
		telephonyMgr.createForSubscriptionId(subId).resetAllCarrierActions();
		}

		private static Notification getNotification(Context context, int titleId, int textId,

telephony/java/android/telephony/TelephonyManager.java

+33 −16

Original line number	Diff line number	Diff line
		@@ -10141,19 +10141,25 @@ public class TelephonyManager {
		}

		/**
		* Action set from carrier signalling broadcast receivers to enable/disable radio
		* Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.
		* @param subId the subscription ID that this action applies to.
		* Carrier action to enable or disable the radio.
		*
		* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
		* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}.
		*
		* @param enabled control enable or disable radio.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void carrierActionSetRadioEnabled(int subId, boolean enabled) {
		public void setRadioEnabled(boolean enabled) {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		service.carrierActionSetRadioEnabled(subId, enabled);
		service.carrierActionSetRadioEnabled(
		getSubId(SubscriptionManager.getDefaultDataSubscriptionId()), enabled);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#carrierActionSetRadioEnabled", e);
		@@ -10161,20 +10167,25 @@ public class TelephonyManager {
		}

		/**
		* Action set from carrier signalling broadcast receivers to start/stop reporting default
		* network available events
		* Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.
		* @param subId the subscription ID that this action applies to.
		* Carrier action to start or stop reporting default network available events.
		*
		* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
		* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}.
		*
		* @param report control start/stop reporting network status.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void carrierActionReportDefaultNetworkStatus(int subId, boolean report) {
		public void reportDefaultNetworkStatus(boolean report) {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		service.carrierActionReportDefaultNetworkStatus(subId, report);
		service.carrierActionReportDefaultNetworkStatus(
		getSubId(SubscriptionManager.getDefaultDataSubscriptionId()), report);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#carrierActionReportDefaultNetworkStatus", e);
		@@ -10182,18 +10193,24 @@ public class TelephonyManager {
		}

		/**
		* Action set from carrier signalling broadcast receivers to reset all carrier actions
		* Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.
		* @param subId the subscription ID that this action applies to.
		* Reset all carrier actions previously set by {@link #setRadioEnabled},
		* {@link #reportDefaultNetworkStatus} and {@link #setCarrierDataEnabled}.
		*
		* <p>If this object has been created with {@link #createForSubscriptionId}, applies to the
		* given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()}
		*
		* <p>Requires Permission:
		* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void carrierActionResetAll(int subId) {
		public void resetAllCarrierActions() {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		service.carrierActionResetAll(subId);
		service.carrierActionResetAll(
		getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#carrierActionResetAll", e);