Merge "Fixed crash in data service" am: 7fab753180 am: ab5a5e8a58 (c4ab4dc0) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/NetworkService.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.telephony;		package android.telephony;

			import android.annotation.NonNull;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.app.Service;		import android.app.Service;
	import android.content.Intent;		import android.content.Intent;
	@@ -112,13 +113,13 @@ public abstract class NetworkService extends Service {
	mSlotId, 0, null).sendToTarget();		mSlotId, 0, null).sendToTarget();
	}		}

	private void registerForStateChanged(INetworkServiceCallback callback) {		private void registerForStateChanged(@NonNull INetworkServiceCallback callback) {
	synchronized (mNetworkRegistrationStateChangedCallbacks) {		synchronized (mNetworkRegistrationStateChangedCallbacks) {
	mNetworkRegistrationStateChangedCallbacks.add(callback);		mNetworkRegistrationStateChangedCallbacks.add(callback);
	}		}
	}		}

	private void unregisterForStateChanged(INetworkServiceCallback callback) {		private void unregisterForStateChanged(@NonNull INetworkServiceCallback callback) {
	synchronized (mNetworkRegistrationStateChangedCallbacks) {		synchronized (mNetworkRegistrationStateChangedCallbacks) {
	mNetworkRegistrationStateChangedCallbacks.remove(callback);		mNetworkRegistrationStateChangedCallbacks.remove(callback);
	}		}

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

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -157,7 +157,10 @@ public abstract class DataService extends Service {
	@Nullable LinkProperties linkProperties,		@Nullable LinkProperties linkProperties,
	@Nullable DataServiceCallback callback) {		@Nullable DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
	callback.onSetupDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED, null);		if (callback != null) {
			callback.onSetupDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,
			null);
			}
	}		}

	/**		/**
	@@ -176,8 +179,10 @@ public abstract class DataService extends Service {
	public void deactivateDataCall(int cid, @DeactivateDataReason int reason,		public void deactivateDataCall(int cid, @DeactivateDataReason int reason,
	@Nullable DataServiceCallback callback) {		@Nullable DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
			if (callback != null) {
	callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);		callback.onDeactivateDataCallComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
	}		}
			}

	/**		/**
	* Set an APN to initial attach network.		* Set an APN to initial attach network.
	@@ -190,7 +195,10 @@ public abstract class DataService extends Service {
	public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming,		public void setInitialAttachApn(DataProfile dataProfile, boolean isRoaming,
	@Nullable DataServiceCallback callback) {		@Nullable DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
	callback.onSetInitialAttachApnComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);		if (callback != null) {
			callback.onSetInitialAttachApnComplete(
			DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
			}
	}		}

	/**		/**
	@@ -206,8 +214,10 @@ public abstract class DataService extends Service {
	public void setDataProfile(List<DataProfile> dps, boolean isRoaming,		public void setDataProfile(List<DataProfile> dps, boolean isRoaming,
	@Nullable DataServiceCallback callback) {		@Nullable DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
			if (callback != null) {
	callback.onSetDataProfileComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);		callback.onSetDataProfileComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED);
	}		}
			}

	/**		/**
	* Get the active data call list.		* Get the active data call list.