Merge "Remove unneeded notify AIDL API" (991f8b0c) · Commits · e / os / android_frameworks_base

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -160,11 +160,6 @@ public class ImsService extends Service {
		ImsService.this.readyForFeatureCreation();
		}

		@Override
		public void notifyImsFeatureReady(int slotId, int featureType) {
		ImsService.this.notifyImsFeatureReady(slotId, featureType);
		}

		@Override
		public IImsConfig getConfig(int slotId) {
		ImsConfigImplBase c = ImsService.this.getConfig(slotId);
		@@ -274,25 +269,6 @@ public class ImsService extends Service {
		}
		}

		private void notifyImsFeatureReady(int slotId, int featureType) {
		synchronized (mFeaturesBySlot) {
		// get ImsFeature associated with the slot/feature
		SparseArray<ImsFeature> features = mFeaturesBySlot.get(slotId);
		if (features == null) {
		Log.w(LOG_TAG, "Can not notify ImsFeature ready. No ImsFeatures exist on " +
		"slot " + slotId);
		return;
		}
		ImsFeature f = features.get(featureType);
		if (f == null) {
		Log.w(LOG_TAG, "Can not notify ImsFeature ready. No feature with type "
		+ featureType + " exists on slot " + slotId);
		return;
		}
		f.onFeatureReady();
		}
		}

		/**
		* When called, provide the {@link ImsFeatureConfiguration} that this {@link ImsService}
		* currently supports. This will trigger the framework to set up the {@link ImsFeature}s that

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,6 @@ interface IImsServiceController {
		ImsFeatureConfiguration querySupportedImsFeatures();
		// Synchronous call to ensure the ImsService is ready before continuing with feature creation.
		void notifyImsServiceReadyForFeatureCreation();
		// Synchronous call to ensure the new ImsFeature is ready before using the Feature.
		void notifyImsFeatureReady(int slotId, int featureType);
		void removeImsFeature(int slotId, int featureType, in IImsFeatureStatusCallback c);
		IImsConfig getConfig(int slotId);
		IImsRegistration getRegistration(int slotId);