Merge "Integrate new ProvisioningManager.Callback API" am: 9bff1bd6c7 (74eb50b0) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -60,9 +60,9 @@ import android.telephony.ims.ImsMmTelManager;
		import android.telephony.ims.ImsReasonInfo;
		import android.telephony.ims.ImsStreamMediaProfile;
		import android.telephony.ims.ImsSuppServiceNotification;
		import android.telephony.ims.ProvisioningManager;
		import android.telephony.ims.feature.ImsFeature;
		import android.telephony.ims.feature.MmTelFeature;
		import android.telephony.ims.stub.ImsConfigImplBase;
		import android.telephony.ims.stub.ImsRegistrationImplBase;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		@@ -855,7 +855,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		// Only close on valid session.
		if (mImsManager != null) {
		try {
		mImsManager.getConfigInterface().removeConfigCallback(mConfigCallback);
		mImsManager.getConfigInterface().removeConfigCallback(mConfigCallback.getBinder());
		} catch (ImsException e) {
		Log.w(LOG_TAG, "stopListeningForCalls: unable to remove config callback.");
		}
		@@ -3126,14 +3126,15 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {

		};

		private final ImsConfigImplBase.Callback mConfigCallback = new ImsConfigImplBase.Callback() {
		private final ProvisioningManager.Callback mConfigCallback =
		new ProvisioningManager.Callback() {
		@Override
		public void onConfigChanged(int item, int value) {
		public void onProvisioningIntChanged(int item, int value) {
		sendConfigChangedIntent(item, Integer.toString(value));
		}

		@Override
		public void onConfigChanged(int item, String value) {
		public void onProvisioningStringChanged(int item, String value) {
		sendConfigChangedIntent(item, value);
		}