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

api/system-current.txt

+3 −3

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

+6 −5

telephony/java/android/telephony/TelephonyManager.java

+33 −16

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

	/**		/**
	* Action set from carrier signalling broadcast receivers to enable/disable radio		* Carrier action to enable or disable the radio.
	* Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.		*
	* @param subId the subscription ID that this action applies to.		* <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.		* @param enabled control enable or disable radio.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public void carrierActionSetRadioEnabled(int subId, boolean enabled) {		public void setRadioEnabled(boolean enabled) {
	try {		try {
	ITelephony service = getITelephony();		ITelephony service = getITelephony();
	if (service != null) {		if (service != null) {
	service.carrierActionSetRadioEnabled(subId, enabled);		service.carrierActionSetRadioEnabled(
			getSubId(SubscriptionManager.getDefaultDataSubscriptionId()), enabled);
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelephony#carrierActionSetRadioEnabled", e);		Log.e(TAG, "Error calling ITelephony#carrierActionSetRadioEnabled", e);
	@@ -10305,20 +10311,25 @@ public class TelephonyManager {
	}		}

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

	/**		/**
	* Action set from carrier signalling broadcast receivers to reset all carrier actions		* Reset all carrier actions previously set by {@link #setRadioEnabled},
	* Permissions {@link android.Manifest.permission.MODIFY_PHONE_STATE} is required.		* {@link #reportDefaultNetworkStatus} and {@link #setCarrierDataEnabled}.
	* @param subId the subscription ID that this action applies to.		*
			* <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		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
	public void carrierActionResetAll(int subId) {		public void resetAllCarrierActions() {
	try {		try {
	ITelephony service = getITelephony();		ITelephony service = getITelephony();
	if (service != null) {		if (service != null) {
	service.carrierActionResetAll(subId);		service.carrierActionResetAll(
			getSubId(SubscriptionManager.getDefaultDataSubscriptionId()));
	}		}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error calling ITelephony#carrierActionResetAll", e);		Log.e(TAG, "Error calling ITelephony#carrierActionResetAll", e);

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

	public class TelephonyManager {		public class TelephonyManager {
	method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);		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 checkCarrierPrivilegesForPackage(String);
	method public int checkCarrierPrivilegesForPackageAnyPhone(String);		method public int checkCarrierPrivilegesForPackageAnyPhone(String);
	method public void dial(String);		method public void dial(String);
	@@ -9738,9 +9735,11 @@ package android.telephony {
	method public boolean needsOtaServiceProvisioning();		method public boolean needsOtaServiceProvisioning();
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();		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 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(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 public void requestModemActivityInfo(@NonNull android.os.ResultReceiver);		method public void requestModemActivityInfo(@NonNull android.os.ResultReceiver);
	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 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 void resetCarrierKeysForImsiEncryption();
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean resetRadioConfig();		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean resetRadioConfig();
	method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();		method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void resetSettings();
	@@ -9754,6 +9753,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 setOpportunisticNetworkState(boolean);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);		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 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 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 setSimPowerState(int);
	method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerStateForSlot(int, int);		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerStateForSlot(int, int);

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

	import com.android.internal.telephony.PhoneConstants;		import com.android.internal.telephony.PhoneConstants;

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

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

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

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

	private static void onShowCaptivePortalNotification(Intent intent, Context context) {		private static void onShowCaptivePortalNotification(Intent intent, Context context) {