diff options
author | Brad Ebinger <breadley@google.com> | 2018-01-23 13:41:32 -0800 |
---|---|---|
committer | Brad Ebinger <breadley@google.com> | 2018-01-31 14:45:04 -0800 |
commit | ed69077f58de2b9abade773ce002062465382fc7 (patch) | |
tree | 47bb9b8918ea25ab7e61b73219f133f49d73673e | |
parent | 936a7d1641a81d73fdaf946a5ffdef9188a277b4 (diff) | |
download | ims-ed69077f58de2b9abade773ce002062465382fc7.tar.gz |
Change ImsService namespaces
Moves some of the ImsService namespaces to
support the move to @SystemApi.
Test: Telephony Unit tests
Bug: 63987047
Merged-In: I4d1a0afc926dfd7d70b3db16dd81f986585a0992
Change-Id: I4d1a0afc926dfd7d70b3db16dd81f986585a0992
-rw-r--r-- | src/java/com/android/ims/ImsCall.java | 7 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsConnectionStateListener.java | 1 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsEcbm.java | 8 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsExternalCallStateListener.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 16 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsMultiEndpoint.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsServiceBase.java | 2 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsServiceProxy.java | 423 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsUt.java | 4 | ||||
-rw-r--r-- | src/java/com/android/ims/MmTelFeatureConnection.java | 9 | ||||
-rw-r--r-- | src/java/com/android/ims/internal/VideoPauseTracker.java | 6 | ||||
-rw-r--r-- | tests/src/com/android/ims/ImsConfigTest.java | 5 |
12 files changed, 35 insertions, 450 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 6200a07c..760e5e81 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -36,10 +36,15 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import android.telephony.ServiceState; +import android.telephony.ims.ImsCallProfile; +import android.telephony.ims.ImsConferenceState; +import android.telephony.ims.ImsReasonInfo; +import android.telephony.ims.ImsStreamMediaProfile; +import android.telephony.ims.ImsSuppServiceNotification; import android.util.Log; import com.android.ims.internal.ICall; -import com.android.ims.internal.ImsCallSession; +import android.telephony.ims.ImsCallSession; import com.android.ims.internal.ImsStreamMediaSession; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/java/com/android/ims/ImsConnectionStateListener.java b/src/java/com/android/ims/ImsConnectionStateListener.java index 049b846d..d5fb633c 100644 --- a/src/java/com/android/ims/ImsConnectionStateListener.java +++ b/src/java/com/android/ims/ImsConnectionStateListener.java @@ -17,6 +17,7 @@ package com.android.ims; import android.net.Uri; +import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.feature.ImsFeature; import android.telephony.ims.feature.MmTelFeature; import android.telephony.ims.stub.ImsRegistrationImplBase; diff --git a/src/java/com/android/ims/ImsEcbm.java b/src/java/com/android/ims/ImsEcbm.java index 53549bf0..99d99f17 100644 --- a/src/java/com/android/ims/ImsEcbm.java +++ b/src/java/com/android/ims/ImsEcbm.java @@ -29,18 +29,12 @@ package com.android.ims; -import java.util.HashMap; -import java.util.Map; - -import android.os.AsyncResult; -import android.os.Bundle; -import android.os.Message; import android.os.RemoteException; import android.telephony.Rlog; +import android.telephony.ims.ImsReasonInfo; import com.android.ims.internal.IImsEcbm; import com.android.ims.internal.IImsEcbmListener; -import com.android.ims.ImsEcbmStateListener; /** * Provides APIs for the supplementary service settings using IMS (Ut interface). diff --git a/src/java/com/android/ims/ImsExternalCallStateListener.java b/src/java/com/android/ims/ImsExternalCallStateListener.java index 3f4f163f..aae4c9b8 100644 --- a/src/java/com/android/ims/ImsExternalCallStateListener.java +++ b/src/java/com/android/ims/ImsExternalCallStateListener.java @@ -16,6 +16,8 @@ package com.android.ims; +import android.telephony.ims.ImsExternalCallState; + import java.util.List; /** diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 9cfff78d..1bedca85 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -31,24 +31,24 @@ import android.os.RemoteException; import android.os.SystemProperties; import android.telecom.TelecomManager; import android.telephony.CarrierConfigManager; -import android.telephony.ims.internal.feature.ImsFeature; import android.telephony.ims.stub.ImsRegistrationImplBase; import android.telephony.Rlog; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.telephony.ims.ImsCallProfile; +import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.aidl.IImsConfig; import android.telephony.ims.aidl.IImsSmsListener; import android.telephony.ims.feature.CapabilityChangeRequest; import android.telephony.ims.feature.ImsFeature; import android.telephony.ims.feature.MmTelFeature; -import android.telephony.ims.stub.ImsRegistrationImplBase; import android.util.Log; import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsEcbm; import com.android.ims.internal.IImsMultiEndpoint; import com.android.ims.internal.IImsUt; -import com.android.ims.internal.ImsCallSession; +import android.telephony.ims.ImsCallSession; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.telephony.ExponentialBackoff; @@ -2101,21 +2101,13 @@ public class ImsManager { public void onSmsReady() throws ImsException{ try { - mImsServiceProxy.onSmsReady(); + mMmTelFeatureConnection.onSmsReady(); } catch (RemoteException e) { throw new ImsException("onSmsReady()", e, ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN); } } - public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback) { - // TODO: implement (coming in ag/3472519) - } - - public void addCapabilitiesCallback(ImsFeature.CapabilityCallback callback) { - // TODO: implement (coming in ag/3472519) - } - /** * Gets the Multi-Endpoint interface to subscribe to multi-enpoint notifications.. * diff --git a/src/java/com/android/ims/ImsMultiEndpoint.java b/src/java/com/android/ims/ImsMultiEndpoint.java index 96926960..1315dbd3 100644 --- a/src/java/com/android/ims/ImsMultiEndpoint.java +++ b/src/java/com/android/ims/ImsMultiEndpoint.java @@ -21,6 +21,8 @@ import com.android.ims.internal.IImsExternalCallStateListener; import android.os.RemoteException; import android.telephony.Rlog; +import android.telephony.ims.ImsExternalCallState; +import android.telephony.ims.ImsReasonInfo; import java.util.List; diff --git a/src/java/com/android/ims/ImsServiceBase.java b/src/java/com/android/ims/ImsServiceBase.java index 66122df6..0a15c9d9 100644 --- a/src/java/com/android/ims/ImsServiceBase.java +++ b/src/java/com/android/ims/ImsServiceBase.java @@ -18,7 +18,7 @@ package com.android.ims; import android.app.PendingIntent; -import com.android.ims.ImsCallProfile; +import android.telephony.ims.ImsCallProfile; import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsCallSessionListener; import com.android.ims.internal.IImsConfig; diff --git a/src/java/com/android/ims/ImsServiceProxy.java b/src/java/com/android/ims/ImsServiceProxy.java deleted file mode 100644 index a8744361..00000000 --- a/src/java/com/android/ims/ImsServiceProxy.java +++ /dev/null @@ -1,423 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.ims; - -import android.annotation.Nullable; -import android.app.PendingIntent; -import android.content.Context; -import android.os.IBinder; -import android.os.Message; -import android.os.RemoteException; -import android.telephony.Rlog; -import android.telephony.TelephonyManager; -import android.telephony.ims.aidl.IImsCallSessionListener; -import android.telephony.ims.feature.ImsFeature; -import android.telephony.SmsMessage; -import android.telephony.ims.internal.stub.SmsImplBase; -import android.util.Log; - -import com.android.ims.internal.IImsCallSession; -import com.android.ims.internal.IImsConfig; -import com.android.ims.internal.IImsEcbm; -import com.android.ims.internal.IImsMMTelFeature; -import com.android.ims.internal.IImsMultiEndpoint; -import com.android.ims.internal.IImsRegistration; -import com.android.ims.internal.IImsRegistrationListener; -import com.android.ims.internal.IImsServiceFeatureCallback; -import com.android.ims.internal.IImsSmsListener; -import com.android.ims.internal.IImsUt; - -/** - * A container of the IImsServiceController binder, which implements all of the ImsFeatures that - * the platform currently supports: MMTel and RCS. - * @hide - */ - -public class ImsServiceProxy { - - protected static final String TAG = "ImsServiceProxy"; - protected final int mSlotId; - protected IBinder mBinder; - private final int mSupportedFeature; - private Context mContext; - - // Start by assuming the proxy is available for usage. - private boolean mIsAvailable = true; - // ImsFeature Status from the ImsService. Cached. - private Integer mFeatureStatusCached = null; - private IFeatureUpdate mStatusCallback; - private final Object mLock = new Object(); - - public static ImsServiceProxy create(Context context , int slotId) { - ImsServiceProxy serviceProxy = new ImsServiceProxy(context, slotId, ImsFeature.MMTEL); - - TelephonyManager tm = getTelephonyManager(context); - if (tm == null) { - Rlog.w(TAG, "getServiceProxy: TelephonyManager is null!"); - // Binder can be unset in this case because it will be torn down/recreated as part of - // a retry mechanism until the serviceProxy binder is set successfully. - return serviceProxy; - } - - IImsMMTelFeature binder = tm.getImsMMTelFeatureAndListen(slotId, - serviceProxy.getListener()); - if (binder != null) { - serviceProxy.setBinder(binder.asBinder()); - // Trigger the cache to be updated for feature status. - serviceProxy.getFeatureStatus(); - } else { - Rlog.w(TAG, "getServiceProxy: binder is null! Phone Id: " + slotId); - } - return serviceProxy; - } - - public static TelephonyManager getTelephonyManager(Context context) { - return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - } - - public interface IFeatureUpdate { - /** - * Called when the ImsFeature has changed its state. Use - * {@link ImsFeature#getFeatureState()} to get the new state. - */ - void notifyStateChanged(); - - /** - * Called when the ImsFeature has become unavailable due to the binder switching or app - * crashing. A new ImsServiceProxy should be requested for that feature. - */ - void notifyUnavailable(); - } - - private final IImsServiceFeatureCallback mListenerBinder = - new IImsServiceFeatureCallback.Stub() { - - @Override - public void imsFeatureCreated(int slotId, int feature) throws RemoteException { - // The feature has been re-enabled. This may happen when the service crashes. - synchronized (mLock) { - if (!mIsAvailable && mSlotId == slotId && feature == mSupportedFeature) { - Log.i(TAG, "Feature enabled on slotId: " + slotId + " for feature: " + - feature); - mIsAvailable = true; - } - } - } - - @Override - public void imsFeatureRemoved(int slotId, int feature) throws RemoteException { - synchronized (mLock) { - if (mIsAvailable && mSlotId == slotId && feature == mSupportedFeature) { - Log.i(TAG, "Feature disabled on slotId: " + slotId + " for feature: " + - feature); - mIsAvailable = false; - if (mStatusCallback != null) { - mStatusCallback.notifyUnavailable(); - } - } - } - } - - @Override - public void imsStatusChanged(int slotId, int feature, int status) throws RemoteException { - synchronized (mLock) { - Log.i(TAG, "imsStatusChanged: slot: " + slotId + " feature: " + feature + - " status: " + status); - if (mSlotId == slotId && feature == mSupportedFeature) { - mFeatureStatusCached = status; - if (mStatusCallback != null) { - mStatusCallback.notifyStateChanged(); - } - } - } - } - }; - - public ImsServiceProxy(Context context, int slotId, IBinder binder, int featureType) { - mSlotId = slotId; - mBinder = binder; - mSupportedFeature = featureType; - mContext = context; - } - - public ImsServiceProxy(Context context, int slotId, int featureType) { - this(context, slotId, null, featureType); - } - - public @Nullable IImsRegistration getRegistration() { - TelephonyManager tm = getTelephonyManager(mContext); - return tm != null ? tm.getImsRegistration(mSlotId, ImsFeature.MMTEL) : null; - } - - public IImsServiceFeatureCallback getListener() { - return mListenerBinder; - } - - public void setBinder(IBinder binder) { - mBinder = binder; - } - - public int startSession(PendingIntent incomingCallIntent, IImsRegistrationListener listener) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).startSession(incomingCallIntent, listener); - } - } - - public void endSession(int sessionId) throws RemoteException { - synchronized (mLock) { - // Only check to make sure the binder connection still exists. This method should - // still be able to be called when the state is STATE_NOT_AVAILABLE. - checkBinderConnection(); - getServiceInterface(mBinder).endSession(sessionId); - } - } - - public boolean isConnected(int callServiceType, int callType) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).isConnected(callServiceType, callType); - } - } - - public boolean isOpened() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).isOpened(); - } - } - - public void addRegistrationListener(IImsRegistrationListener listener) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).addRegistrationListener(listener); - } - } - - public void removeRegistrationListener(IImsRegistrationListener listener) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).removeRegistrationListener(listener); - } - } - - public ImsCallProfile createCallProfile(int sessionId, int callServiceType, int callType) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).createCallProfile(sessionId, callServiceType, - callType); - } - } - - public IImsCallSession createCallSession(int sessionId, ImsCallProfile profile) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).createCallSession(sessionId, profile); - } - } - - public IImsCallSession getPendingCallSession(int sessionId, String callId) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).getPendingCallSession(sessionId, callId); - } - } - - public IImsUt getUtInterface() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).getUtInterface(); - } - } - - public IImsConfig getConfigInterface() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).getConfigInterface(); - } - } - - public void turnOnIms() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).turnOnIms(); - } - } - - public void turnOffIms() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).turnOffIms(); - } - } - - public IImsEcbm getEcbmInterface() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).getEcbmInterface(); - } - } - - public void setUiTTYMode(int uiTtyMode, Message onComplete) - throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).setUiTTYMode(uiTtyMode, onComplete); - } - } - - public IImsMultiEndpoint getMultiEndpointInterface() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).getMultiEndpointInterface(); - } - } - - /** - * @return an integer describing the current Feature Status, defined in - * {@link ImsFeature.ImsState}. - */ - public int getFeatureStatus() { - synchronized (mLock) { - if (isBinderAlive() && mFeatureStatusCached != null) { - Log.i(TAG, "getFeatureStatus - returning cached: " + mFeatureStatusCached); - return mFeatureStatusCached; - } - } - // Don't synchronize on Binder call. - Integer status = retrieveFeatureStatus(); - synchronized (mLock) { - if (status == null) { - return ImsFeature.STATE_NOT_AVAILABLE; - } - // Cache only non-null value for feature status. - mFeatureStatusCached = status; - } - Log.i(TAG, "getFeatureStatus - returning " + status); - return status; - } - - /** - * Internal method used to retrieve the feature status from the corresponding ImsService. - */ - private Integer retrieveFeatureStatus() { - if (mBinder != null) { - try { - return getServiceInterface(mBinder).getFeatureStatus(); - } catch (RemoteException e) { - // Status check failed, don't update cache - } - } - return null; - } - - /** - * @param c Callback that will fire when the feature status has changed. - */ - public void setStatusCallback(IFeatureUpdate c) { - mStatusCallback = c; - } - - public void sendSms(int token, int messageRef, String format, String smsc, boolean isRetry, - byte[] pdu) throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).sendSms(token, messageRef, format, smsc, isRetry, - pdu); - } - } - - public void acknowledgeSms(int token, int messageRef, - @SmsImplBase.SendStatusResult int result) throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).acknowledgeSms(token, messageRef, result); - } - } - - public void acknowledgeSmsReport(int token, int messageRef, - @SmsImplBase.StatusReportResult int result) throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).acknowledgeSmsReport(token, messageRef, result); - } - } - - public String getSmsFormat() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - return getServiceInterface(mBinder).getSmsFormat(); - } - } - - public void onSmsReady() throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).onSmsReady(); - } - } - - public void setSmsListener(IImsSmsListener listener) throws RemoteException { - synchronized (mLock) { - checkServiceIsReady(); - getServiceInterface(mBinder).setSmsListener(listener); - } - } - - /** - * @return Returns true if the ImsService is ready to take commands, false otherwise. If this - * method returns false, it doesn't mean that the Binder connection is not available (use - * {@link #isBinderReady()} to check that), but that the ImsService is not accepting commands - * at this time. - * - * For example, for DSDS devices, only one slot can be {@link ImsFeature#STATE_READY} to take - * commands at a time, so the other slot must stay at {@link ImsFeature#STATE_NOT_AVAILABLE}. - */ - public boolean isBinderReady() { - return isBinderAlive() && getFeatureStatus() == ImsFeature.STATE_READY; - } - - /** - * @return false if the binder connection is no longer alive. - */ - public boolean isBinderAlive() { - return mIsAvailable && mBinder != null && mBinder.isBinderAlive(); - } - - protected void checkServiceIsReady() throws RemoteException { - if (!isBinderReady()) { - throw new RemoteException("ImsServiceProxy is not ready to accept commands."); - } - } - - private IImsMMTelFeature getServiceInterface(IBinder b) { - return IImsMMTelFeature.Stub.asInterface(b); - } - - protected void checkBinderConnection() throws RemoteException { - if (!isBinderAlive()) { - throw new RemoteException("ImsServiceProxy is not available for that feature."); - } - } -} diff --git a/src/java/com/android/ims/ImsUt.java b/src/java/com/android/ims/ImsUt.java index eaeb5511..b3d4c8af 100644 --- a/src/java/com/android/ims/ImsUt.java +++ b/src/java/com/android/ims/ImsUt.java @@ -27,6 +27,10 @@ import android.os.Message; import android.os.Registrant; import android.os.RemoteException; import android.telephony.Rlog; +import android.telephony.ims.ImsCallForwardInfo; +import android.telephony.ims.ImsReasonInfo; +import android.telephony.ims.ImsSsData; +import android.telephony.ims.ImsSsInfo; import com.android.ims.internal.IImsUt; import com.android.ims.internal.IImsUtListener; diff --git a/src/java/com/android/ims/MmTelFeatureConnection.java b/src/java/com/android/ims/MmTelFeatureConnection.java index 00dec65c..571670d5 100644 --- a/src/java/com/android/ims/MmTelFeatureConnection.java +++ b/src/java/com/android/ims/MmTelFeatureConnection.java @@ -24,6 +24,8 @@ import android.os.Message; import android.os.RemoteException; import android.telephony.Rlog; import android.telephony.TelephonyManager; +import android.telephony.ims.ImsCallProfile; +import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.aidl.IImsConfig; import android.telephony.ims.aidl.IImsMmTelFeature; import android.telephony.ims.aidl.IImsRegistration; @@ -524,6 +526,13 @@ public class MmTelFeatureConnection { } } + public void onSmsReady() throws RemoteException { + synchronized (mLock) { + checkServiceIsReady(); + getServiceInterface(mBinder).onSmsReady(); + } + } + public void setSmsListener(IImsSmsListener listener) throws RemoteException { synchronized (mLock) { checkServiceIsReady(); diff --git a/src/java/com/android/ims/internal/VideoPauseTracker.java b/src/java/com/android/ims/internal/VideoPauseTracker.java index baa3163f..92430082 100644 --- a/src/java/com/android/ims/internal/VideoPauseTracker.java +++ b/src/java/com/android/ims/internal/VideoPauseTracker.java @@ -18,11 +18,11 @@ package com.android.ims.internal; import android.telecom.Log; import android.telecom.VideoProfile; +import android.telephony.ims.ImsVideoCallProvider; import android.util.ArraySet; import java.util.Collection; import java.util.Set; -import java.util.StringJoiner; import java.util.stream.Collectors; /** @@ -71,7 +71,7 @@ public class VideoPauseTracker { * * @param source The source of the pause request. * @return {@code true} if a pause should be issued to the - * {@link com.android.ims.internal.ImsVideoCallProvider}, {@code false} otherwise. + * {@link ImsVideoCallProvider}, {@code false} otherwise. */ public boolean shouldPauseVideoFor(int source) { synchronized (mPauseRequestsLock) { @@ -102,7 +102,7 @@ public class VideoPauseTracker { * * @param source The source of the resume request. * @return {@code true} if a resume should be issued to the - * {@link com.android.ims.internal.ImsVideoCallProvider}, {@code false} otherwise. + * {@link ImsVideoCallProvider}, {@code false} otherwise. */ public boolean shouldResumeVideoFor(int source) { synchronized (mPauseRequestsLock) { diff --git a/tests/src/com/android/ims/ImsConfigTest.java b/tests/src/com/android/ims/ImsConfigTest.java index 18d53b1c..4cf7a926 100644 --- a/tests/src/com/android/ims/ImsConfigTest.java +++ b/tests/src/com/android/ims/ImsConfigTest.java @@ -17,8 +17,7 @@ package com.android.ims; import android.support.test.runner.AndroidJUnit4; - -import com.android.ims.internal.IImsConfig; +import android.telephony.ims.aidl.IImsConfig; import org.junit.After; import org.junit.Before; @@ -59,6 +58,6 @@ public class ImsConfigTest extends ImsTestBase { mTestImsConfig.getProvisionedValue(testItem); - verify(mMockImsConfigInterface).getProvisionedValue(eq(testItem)); + verify(mMockImsConfigInterface).getConfigInt(eq(testItem)); } } |