Merge "Call readyForFeatureCreation for ImsService" into pi-dev (54be3d16) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ims/ImsServiceController.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,7 @@ public class ImsServiceController {
		service.linkToDeath(mImsDeathRecipient, 0);
		mImsServiceControllerBinder = service;
		setServiceController(service);
		notifyImsServiceReady();
		// create all associated features in the ImsService
		for (ImsFeatureConfiguration.FeatureSlotPair i : mImsFeatures) {
		addImsServiceFeature(i);
		@@ -558,6 +559,18 @@ public class ImsServiceController {
		}
		}

		/**
		* notify the ImsService that the ImsService is ready for feature creation.
		*/
		protected void notifyImsServiceReady() throws RemoteException {
		synchronized (mLock) {
		if (isServiceControllerAvailable()) {
		Log.d(LOG_TAG, "notifyImsServiceReady");
		mIImsServiceController.notifyImsServiceReadyForFeatureCreation();
		}
		}
		}

		protected String getServiceInterface() {
		return ImsService.SERVICE_INTERFACE;
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ public class ImsServiceControllerCompat extends ImsServiceController {
		/**
		* @return the IImsRegistration that corresponds to the slot id specified.
		*/
		@Override
		public IImsRegistration getRegistration(int slotId) throws RemoteException {
		ImsRegistrationCompatAdapter adapter = mRegCompatAdapters.get(slotId);
		if (adapter == null) {
		@@ -115,6 +116,7 @@ public class ImsServiceControllerCompat extends ImsServiceController {
		/**
		* @return the IImsConfig that corresponds to the slot id specified.
		*/
		@Override
		public IImsConfig getConfig(int slotId) throws RemoteException {
		ImsConfigCompatAdapter adapter = mConfigCompatAdapters.get(slotId);
		if (adapter == null) {
		@@ -124,6 +126,12 @@ public class ImsServiceControllerCompat extends ImsServiceController {
		return adapter.getIImsConfig();
		}

		@Override
		protected void notifyImsServiceReady() throws RemoteException {
		Log.d(TAG, "notifyImsServiceReady");
		// don't do anything for compat impl.
		}

		@Override
		protected IInterface createImsFeature(int slotId, int featureType, IImsFeatureStatusCallback c)
		throws RemoteException {

+0 −5

Original line number	Diff line number	Diff line
		@@ -70,11 +70,6 @@ public class TestImsServiceControllerAdapter {
		public void notifyImsServiceReadyForFeatureCreation() {
		}

		@Override
		public void notifyImsFeatureReady(int slotId, int featureType)
		throws RemoteException {
		}

		@Override
		public IImsConfig getConfig(int slotId) throws RemoteException {
		return new ImsConfigImplBase().getIImsConfig();