Change ImsService API namespaces am: 1846615c7c (d6346942) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ImsSmsDispatcher.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -19,7 +19,10 @@ package com.android.internal.telephony;
		import android.os.RemoteException;
		import android.os.Message;
		import android.telephony.Rlog;
		import android.telephony.ims.ImsReasonInfo;
		import android.telephony.ims.aidl.IImsSmsListener;
		import android.telephony.ims.feature.ImsFeature;
		import android.telephony.ims.feature.MmTelFeature;
		import android.telephony.ims.stub.ImsRegistrationImplBase;
		import android.telephony.ims.stub.ImsSmsImplBase;
		import android.telephony.ims.stub.ImsSmsImplBase.SendStatusResult;
		@@ -28,7 +31,7 @@ import android.util.Pair;

		import com.android.ims.ImsException;
		import com.android.ims.ImsManager;
		import com.android.ims.ImsServiceProxy;
		import com.android.ims.MmTelFeatureConnection;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
		import com.android.internal.telephony.util.SMSDispatcherUtil;
		@@ -98,7 +101,7 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		}

		@Override
		public void onDeregistered(com.android.ims.ImsReasonInfo info) {
		public void onDeregistered(ImsReasonInfo info) {
		Rlog.d(TAG, "onImsDisconnected imsReasonInfo=" + info);
		synchronized (mLock) {
		mIsRegistered = false;
		@@ -118,12 +121,12 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		};

		// Callback fires when ImsManager MMTel Feature changes state
		private ImsServiceProxy.IFeatureUpdate mNotifyStatusChangedCallback =
		new ImsServiceProxy.IFeatureUpdate() {
		private MmTelFeatureConnection.IFeatureUpdate mNotifyStatusChangedCallback =
		new MmTelFeatureConnection.IFeatureUpdate() {
		@Override
		public void notifyStateChanged() {
		try {
		int status = getImsManager().getImsServiceStatus();
		int status = getImsManager().getImsServiceState();
		Rlog.d(TAG, "Status Changed: " + status);
		switch (status) {
		case android.telephony.ims.feature.ImsFeature.STATE_READY: {
		@@ -135,7 +138,7 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		}
		case android.telephony.ims.feature.ImsFeature.STATE_INITIALIZING:
		// fall through
		case android.telephony.ims.feature.ImsFeature.STATE_NOT_AVAILABLE:
		case ImsFeature.STATE_UNAVAILABLE:
		synchronized (mLock) {
		mIsImsServiceUp = false;
		}
		@@ -277,7 +280,7 @@ public class ImsSmsDispatcher extends SMSDispatcher {
		if (getImsManager().isServiceAvailable()) {
		return;
		}
		// remove callback so we do not receive updates from old ImsServiceProxy when switching
		// remove callback so we do not receive updates from old MmTelFeatureConnection when switching
		// between ImsServices.
		getImsManager().removeNotifyStatusChangedCallback(mNotifyStatusChangedCallback);
		// Exponential backoff during retry, limited to 32 seconds.

src/java/com/android/internal/telephony/TelephonyTester.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -27,10 +27,10 @@ import android.telephony.Rlog;
		import android.telephony.ServiceState;

		import com.android.ims.ImsCall;
		import com.android.ims.ImsCallProfile;
		import com.android.ims.ImsConferenceState;
		import com.android.ims.ImsExternalCallState;
		import com.android.ims.ImsReasonInfo;
		import android.telephony.ims.ImsCallProfile;
		import android.telephony.ims.ImsConferenceState;
		import android.telephony.ims.ImsExternalCallState;
		import android.telephony.ims.ImsReasonInfo;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
		import com.android.internal.telephony.imsphone.ImsPhone;

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

+3 −1

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

		package com.android.internal.telephony.imsphone;

		import android.telephony.ims.ImsExternalCallState;

		import com.android.internal.telephony.Call;
		import com.android.internal.telephony.CallStateException;
		import com.android.internal.telephony.Connection;
		@@ -25,7 +27,7 @@ import java.util.List;

		/**
		* Companion class for {@link ImsExternalConnection}; represents an external call which was
		* received via {@link com.android.ims.ImsExternalCallState} info.
		* received via {@link ImsExternalCallState} info.
		*/
		public class ImsExternalCall extends Call {

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package com.android.internal.telephony.imsphone;

		import com.android.ims.ImsCallProfile;
		import com.android.ims.ImsExternalCallState;
		import android.telephony.ims.ImsCallProfile;
		import android.telephony.ims.ImsExternalCallState;
		import com.android.ims.ImsExternalCallStateListener;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.Call;
		@@ -31,7 +31,6 @@ import android.os.Handler;
		import android.os.Message;
		import android.telecom.PhoneAccountHandle;
		import android.telecom.VideoProfile;
		import android.telephony.TelephonyManager;
		import android.util.ArrayMap;
		import android.util.Log;

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -28,11 +28,9 @@ import android.content.Context;
		import android.net.Uri;
		import android.telecom.PhoneAccount;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.Rlog;
		import android.util.Log;
		import android.telephony.ims.ImsExternalCallState;

		import java.util.Collections;
		import java.util.List;
		import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;

		@@ -42,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
		* Package.
		*
		* Dialog event package information is received from the IMS framework via
		* {@link com.android.ims.ImsExternalCallState} instances.
		* {@link ImsExternalCallState} instances.
		*
		* @hide
		*/