Merge "Syncronize frameowrk and ImsStack operation for ImsFeatureStatusCallback." (691bfb64) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ims/ImsService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -425,8 +425,8 @@ public class ImsService extends Service {
		}
		}

		private IImsRcsFeature createRcsFeatureInternal(int slotId, int subI) {
		RcsFeature f = createRcsFeatureForSubscription(slotId, subI);
		private IImsRcsFeature createRcsFeatureInternal(int slotId, int subId) {
		RcsFeature f = createRcsFeatureForSubscription(slotId, subId);
		if (f != null) {
		f.setDefaultExecutor(mExecutor);
		setupFeature(f, slotId, ImsFeature.FEATURE_RCS);

+9 −5

Original line number	Diff line number	Diff line
		@@ -394,10 +394,12 @@ public abstract class ImsFeature {
		@VisibleForTesting
		public void addImsFeatureStatusCallback(@NonNull IImsFeatureStatusCallback c) {
		try {
		synchronized (mStatusCallbacks) {
		// Add the callback if the callback completes successfully without a RemoteException
		mStatusCallbacks.register(c);
		// If we have just connected, send queued status.
		c.notifyImsFeatureStatus(getFeatureState());
		// Add the callback if the callback completes successfully without a RemoteException.
		mStatusCallbacks.register(c);
		}
		} catch (RemoteException e) {
		Log.w(LOG_TAG, "Couldn't notify feature state: " + e.getMessage());
		}
		@@ -409,8 +411,10 @@ public abstract class ImsFeature {
		*/
		@VisibleForTesting
		public void removeImsFeatureStatusCallback(@NonNull IImsFeatureStatusCallback c) {
		synchronized (mStatusCallbacks) {
		mStatusCallbacks.unregister(c);
		}
		}

		/**
		* Internal method called by ImsFeature when setFeatureState has changed.