Merge "Combined flags of data service requests into one reason param" (28f64b86) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −2

telephony/java/android/telephony/data/DataService.java

+54 −27

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.telephony.data;		package android.telephony.data;

	import android.annotation.CallSuper;		import android.annotation.CallSuper;
			import android.annotation.IntDef;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.app.Service;		import android.app.Service;
	import android.content.Intent;		import android.content.Intent;
	@@ -32,6 +33,8 @@ import android.telephony.Rlog;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	import android.util.SparseArray;		import android.util.SparseArray;

			import java.lang.annotation.Retention;
			import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;

	@@ -56,6 +59,33 @@ public abstract class DataService extends Service {
	public static final String DATA_SERVICE_INTERFACE = "android.telephony.data.DataService";		public static final String DATA_SERVICE_INTERFACE = "android.telephony.data.DataService";
	public static final String DATA_SERVICE_EXTRA_SLOT_ID = "android.telephony.data.extra.SLOT_ID";		public static final String DATA_SERVICE_EXTRA_SLOT_ID = "android.telephony.data.extra.SLOT_ID";

			/** {@hide} */
			@IntDef(prefix = "REQUEST_REASON_", value = {
			REQUEST_REASON_NORMAL,
			REQUEST_REASON_HANDOVER,
			})
			@Retention(RetentionPolicy.SOURCE)
			public @interface SetupDataReason {}

			/** {@hide} */
			@IntDef(prefix = "REQUEST_REASON_", value = {
			REQUEST_REASON_NORMAL,
			REQUEST_REASON_SHUTDOWN,
			REQUEST_REASON_HANDOVER,
			})
			@Retention(RetentionPolicy.SOURCE)
			public @interface DeactivateDataReason {}


			/** The reason of the data request is normal */
			public static final int REQUEST_REASON_NORMAL = 1;

			/** The reason of the data request is device shutdown */
			public static final int REQUEST_REASON_SHUTDOWN = 2;

			/** The reason of the data request is IWLAN handover */
			public static final int REQUEST_REASON_HANDOVER = 3;

	private static final int DATA_SERVICE_INTERNAL_REQUEST_INITIALIZE_SERVICE = 1;		private static final int DATA_SERVICE_INTERNAL_REQUEST_INITIALIZE_SERVICE = 1;
	private static final int DATA_SERVICE_REQUEST_SETUP_DATA_CALL = 2;		private static final int DATA_SERVICE_REQUEST_SETUP_DATA_CALL = 2;
	private static final int DATA_SERVICE_REQUEST_DEACTIVATE_DATA_CALL = 3;		private static final int DATA_SERVICE_REQUEST_DEACTIVATE_DATA_CALL = 3;
	@@ -110,13 +140,14 @@ public abstract class DataService extends Service {
	* @param dataProfile Data profile used for data call setup. See {@link DataProfile}		* @param dataProfile Data profile used for data call setup. See {@link DataProfile}
	* @param isRoaming True if the device is data roaming.		* @param isRoaming True if the device is data roaming.
	* @param allowRoaming True if data roaming is allowed by the user.		* @param allowRoaming True if data roaming is allowed by the user.
	* @param isHandover True if the request is for IWLAN handover.		* @param reason The reason for data setup. Must be {@link #REQUEST_REASON_NORMAL} or
	* @param linkProperties If {@code isHandover} is true, this is the link properties of the		* {@link #REQUEST_REASON_HANDOVER}.
	* existing data connection, otherwise null.		* @param linkProperties If {@code reason} is {@link #REQUEST_REASON_HANDOVER}, this is the
			* link properties of the existing data connection, otherwise null.
	* @param callback The result callback for this request.		* @param callback The result callback for this request.
	*/		*/
	public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,		public void setupDataCall(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
	boolean allowRoaming, boolean isHandover,		boolean allowRoaming, @SetupDataReason int reason,
	LinkProperties linkProperties, DataServiceCallback callback) {		LinkProperties linkProperties, DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
	callback.onSetupDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED, null);		callback.onSetupDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED, null);
	@@ -128,12 +159,12 @@ public abstract class DataService extends Service {
	* provided callback to notify the platform.		* provided callback to notify the platform.
	*		*
	* @param cid Call id returned in the callback of {@link DataServiceProvider#setupDataCall(		* @param cid Call id returned in the callback of {@link DataServiceProvider#setupDataCall(
	* int, DataProfile, boolean, boolean, boolean, LinkProperties, DataServiceCallback)}.		* int, DataProfile, boolean, boolean, int, LinkProperties, DataServiceCallback)}.
	* @param reasonRadioShutDown True if the deactivate request reason is device shut down.		* @param reason The reason for data deactivation. Must be {@link #REQUEST_REASON_NORMAL},
	* @param isHandover True if the request is for IWLAN handover.		* {@link #REQUEST_REASON_SHUTDOWN} or {@link #REQUEST_REASON_HANDOVER}.
	* @param callback The result callback for this request.		* @param callback The result callback for this request.
	*/		*/
	public void deactivateDataCall(int cid, boolean reasonRadioShutDown, boolean isHandover,		public void deactivateDataCall(int cid, @DeactivateDataReason int reason,
	DataServiceCallback callback) {		DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
	callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);		callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
	@@ -219,32 +250,29 @@ public abstract class DataService extends Service {
	public final DataProfile dataProfile;		public final DataProfile dataProfile;
	public final boolean isRoaming;		public final boolean isRoaming;
	public final boolean allowRoaming;		public final boolean allowRoaming;
	public final boolean isHandover;		public final int reason;
	public final LinkProperties linkProperties;		public final LinkProperties linkProperties;
	public final IDataServiceCallback callback;		public final IDataServiceCallback callback;
	SetupDataCallRequest(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,		SetupDataCallRequest(int accessNetworkType, DataProfile dataProfile, boolean isRoaming,
	boolean allowRoaming, boolean isHandover,		boolean allowRoaming, int reason, LinkProperties linkProperties,
	LinkProperties linkProperties, IDataServiceCallback callback) {		IDataServiceCallback callback) {
	this.accessNetworkType = accessNetworkType;		this.accessNetworkType = accessNetworkType;
	this.dataProfile = dataProfile;		this.dataProfile = dataProfile;
	this.isRoaming = isRoaming;		this.isRoaming = isRoaming;
	this.allowRoaming = allowRoaming;		this.allowRoaming = allowRoaming;
	this.linkProperties = linkProperties;		this.linkProperties = linkProperties;
	this.isHandover = isHandover;		this.reason = reason;
	this.callback = callback;		this.callback = callback;
	}		}
	}		}

	private static final class DeactivateDataCallRequest {		private static final class DeactivateDataCallRequest {
	public final int cid;		public final int cid;
	public final boolean reasonRadioShutDown;		public final int reason;
	public final boolean isHandover;
	public final IDataServiceCallback callback;		public final IDataServiceCallback callback;
	DeactivateDataCallRequest(int cid, boolean reasonRadioShutDown, boolean isHandover,		DeactivateDataCallRequest(int cid, int reason, IDataServiceCallback callback) {
	IDataServiceCallback callback) {
	this.cid = cid;		this.cid = cid;
	this.reasonRadioShutDown = reasonRadioShutDown;		this.reason = reason;
	this.isHandover = isHandover;
	this.callback = callback;		this.callback = callback;
	}		}
	}		}
	@@ -311,7 +339,7 @@ public abstract class DataService extends Service {
	SetupDataCallRequest setupDataCallRequest = (SetupDataCallRequest) message.obj;		SetupDataCallRequest setupDataCallRequest = (SetupDataCallRequest) message.obj;
	service.setupDataCall(setupDataCallRequest.accessNetworkType,		service.setupDataCall(setupDataCallRequest.accessNetworkType,
	setupDataCallRequest.dataProfile, setupDataCallRequest.isRoaming,		setupDataCallRequest.dataProfile, setupDataCallRequest.isRoaming,
	setupDataCallRequest.allowRoaming, setupDataCallRequest.isHandover,		setupDataCallRequest.allowRoaming, setupDataCallRequest.reason,
	setupDataCallRequest.linkProperties,		setupDataCallRequest.linkProperties,
	new DataServiceCallback(setupDataCallRequest.callback));		new DataServiceCallback(setupDataCallRequest.callback));

	@@ -321,8 +349,7 @@ public abstract class DataService extends Service {
	DeactivateDataCallRequest deactivateDataCallRequest =		DeactivateDataCallRequest deactivateDataCallRequest =
	(DeactivateDataCallRequest) message.obj;		(DeactivateDataCallRequest) message.obj;
	service.deactivateDataCall(deactivateDataCallRequest.cid,		service.deactivateDataCall(deactivateDataCallRequest.cid,
	deactivateDataCallRequest.reasonRadioShutDown,		deactivateDataCallRequest.reason,
	deactivateDataCallRequest.isHandover,
	new DataServiceCallback(deactivateDataCallRequest.callback));		new DataServiceCallback(deactivateDataCallRequest.callback));
	break;		break;
	case DATA_SERVICE_REQUEST_SET_INITIAL_ATTACH_APN:		case DATA_SERVICE_REQUEST_SET_INITIAL_ATTACH_APN:
	@@ -370,7 +397,8 @@ public abstract class DataService extends Service {
	}		}
	}		}

	private DataService() {		/** @hide */
			protected DataService() {
	mHandlerThread = new HandlerThread(TAG);		mHandlerThread = new HandlerThread(TAG);
	mHandlerThread.start();		mHandlerThread.start();

	@@ -472,19 +500,18 @@ public abstract class DataService extends Service {

	@Override		@Override
	public void setupDataCall(int accessNetworkType, DataProfile dataProfile,		public void setupDataCall(int accessNetworkType, DataProfile dataProfile,
	boolean isRoaming, boolean allowRoaming, boolean isHandover,		boolean isRoaming, boolean allowRoaming, int reason,
	LinkProperties linkProperties, IDataServiceCallback callback) {		LinkProperties linkProperties, IDataServiceCallback callback) {
	mHandler.obtainMessage(DATA_SERVICE_REQUEST_SETUP_DATA_CALL, mSlotId, 0,		mHandler.obtainMessage(DATA_SERVICE_REQUEST_SETUP_DATA_CALL, mSlotId, 0,
	new SetupDataCallRequest(accessNetworkType, dataProfile, isRoaming,		new SetupDataCallRequest(accessNetworkType, dataProfile, isRoaming,
	allowRoaming, isHandover, linkProperties, callback))		allowRoaming, reason, linkProperties, callback))
	.sendToTarget();		.sendToTarget();
	}		}

	@Override		@Override
	public void deactivateDataCall(int cid, boolean reasonRadioShutDown, boolean isHandover,		public void deactivateDataCall(int cid, int reason, IDataServiceCallback callback) {
	IDataServiceCallback callback) {
	mHandler.obtainMessage(DATA_SERVICE_REQUEST_DEACTIVATE_DATA_CALL, mSlotId, 0,		mHandler.obtainMessage(DATA_SERVICE_REQUEST_DEACTIVATE_DATA_CALL, mSlotId, 0,
	new DeactivateDataCallRequest(cid, reasonRadioShutDown, isHandover, callback))		new DeactivateDataCallRequest(cid, reason, callback))
	.sendToTarget();		.sendToTarget();
	}		}

telephony/java/android/telephony/data/IDataService.aidl

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -26,10 +26,9 @@ import android.telephony.data.IDataServiceCallback;
	oneway interface IDataService		oneway interface IDataService
	{		{
	void setupDataCall(int accessNetwork, in DataProfile dataProfile, boolean isRoaming,		void setupDataCall(int accessNetwork, in DataProfile dataProfile, boolean isRoaming,
	boolean allowRoaming, boolean isHandover, in LinkProperties linkProperties,		boolean allowRoaming, int reason, in LinkProperties linkProperties,
	IDataServiceCallback callback);
	void deactivateDataCall(int cid, boolean reasonRadioShutDown, boolean isHandover,
	IDataServiceCallback callback);		IDataServiceCallback callback);
			void deactivateDataCall(int cid, int reason, IDataServiceCallback callback);
	void setInitialAttachApn(in DataProfile dataProfile, boolean isRoaming,		void setInitialAttachApn(in DataProfile dataProfile, boolean isRoaming,
	IDataServiceCallback callback);		IDataServiceCallback callback);
	void setDataProfile(in List<DataProfile> dps, boolean isRoaming, IDataServiceCallback callback);		void setDataProfile(in List<DataProfile> dps, boolean isRoaming, IDataServiceCallback callback);