Merge "Add call screening service binding rule for outgoing call."
diff --git a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
index e80eeba..f2ea950 100644
--- a/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
+++ b/src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
@@ -176,7 +176,7 @@
return account.getLabel().toString();
} else {
// Finally, just get the network name from telephony.
- return TelephonyManager.from(mContext)
+ return mContext.getSystemService(TelephonyManager.class)
.getNetworkOperatorName();
}
} finally {
@@ -203,7 +203,8 @@
}
}
if (TextUtils.isEmpty(address)) {
- address = TelephonyManager.from(mContext).getLine1Number();
+ address = mContext.getSystemService(TelephonyManager.class)
+ .getLine1Number();
if (address == null) address = "";
}
return address;
diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 8b13709..6e48f56 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -30,12 +30,14 @@
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.Trace;
+import android.os.UserHandle;
import android.provider.ContactsContract.Contacts;
import android.telecom.CallAudioState;
+import android.telecom.CallerInfo;
import android.telecom.Conference;
+import android.telecom.Connection;
import android.telecom.ConnectionService;
import android.telecom.DisconnectCause;
-import android.telecom.Connection;
import android.telecom.GatewayInfo;
import android.telecom.Log;
import android.telecom.Logging.EventManager;
@@ -51,17 +53,13 @@
import android.telephony.emergency.EmergencyNumber;
import android.text.TextUtils;
import android.util.StatsLog;
-import android.os.UserHandle;
import android.widget.Toast;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telecom.IVideoProvider;
-import android.telephony.CallerInfo;
-import com.android.internal.telephony.SmsApplication;
import com.android.internal.util.Preconditions;
import java.io.IOException;
-import java.lang.String;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -2649,7 +2647,7 @@
}
// Is there a valid SMS application on the phone?
- if (SmsApplication.getDefaultRespondViaMessageApplication(mContext,
+ if (TelephonyManager.getDefaultRespondViaMessageApplication(mContext,
true /*updateIfNeeded*/) == null) {
return false;
}
diff --git a/src/com/android/server/telecom/CallLogManager.java b/src/com/android/server/telecom/CallLogManager.java
index 664cbd3..f616b13 100755
--- a/src/com/android/server/telecom/CallLogManager.java
+++ b/src/com/android/server/telecom/CallLogManager.java
@@ -41,7 +41,7 @@
// TODO: Needed for move to system service: import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.callfiltering.CallFilteringResult;
import java.util.Arrays;
@@ -131,6 +131,11 @@
private static final String TAG = CallLogManager.class.getSimpleName();
+ // Copied from android.telephony.DisconnectCause.toString
+ // TODO: come up with a better way to indicate in a android.telecom.DisconnectCause that
+ // a conference was merged successfully
+ private static final String REASON_IMS_MERGED_SUCCESSFULLY = "IMS_MERGED_SUCCESSFULLY";
+
private final Context mContext;
private final CarrierConfigManager mCarrierConfigManager;
private final PhoneAccountRegistrar mPhoneAccountRegistrar;
@@ -252,9 +257,7 @@
// Otherwise, fall through. Merged calls would be associated with disconnected
// connections because of special carrier requirements. Those calls don't look like
// merged, e.g. could be one active and the other on hold.
- if (cause != null && android.telephony.DisconnectCause.toString(
- android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY)
- .equals(cause.getReason())) {
+ if (cause != null && REASON_IMS_MERGED_SUCCESSFULLY.equals(cause.getReason())) {
int subscriptionId = mPhoneAccountRegistrar
.getSubscriptionIdForPhoneAccount(call.getTargetPhoneAccount());
// By default, the conference should return a list of participants.
diff --git a/src/com/android/server/telecom/CallerInfoAsyncQueryFactory.java b/src/com/android/server/telecom/CallerInfoAsyncQueryFactory.java
index 0a61493..cfb9f6d 100644
--- a/src/com/android/server/telecom/CallerInfoAsyncQueryFactory.java
+++ b/src/com/android/server/telecom/CallerInfoAsyncQueryFactory.java
@@ -15,7 +15,7 @@
*/
package com.android.server.telecom;
-import android.telephony.CallerInfoAsyncQuery;
+import android.telecom.CallerInfoAsyncQuery;
import android.content.Context;
diff --git a/src/com/android/server/telecom/CallerInfoLookupHelper.java b/src/com/android/server/telecom/CallerInfoLookupHelper.java
index 931eeb6..e9f1c16 100644
--- a/src/com/android/server/telecom/CallerInfoLookupHelper.java
+++ b/src/com/android/server/telecom/CallerInfoLookupHelper.java
@@ -28,8 +28,8 @@
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
-import android.telephony.CallerInfo;
-import android.telephony.CallerInfoAsyncQuery;
+import android.telecom.CallerInfo;
+import android.telecom.CallerInfoAsyncQuery;
import java.util.HashMap;
import java.util.LinkedList;
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 58f94c8..63fe1f4 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -72,7 +72,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.AsyncEmergencyContactNotifier;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.util.IndentingPrintWriter;
@@ -358,7 +358,7 @@
private boolean mCanAddCall = true;
- private TelephonyManager.MultiSimVariants mRadioSimVariants = null;
+ private int mMaxNumberOfSimultaneouslyActiveSims = -1;
private Runnable mStopTone;
@@ -2417,14 +2417,13 @@
mPhoneAccountRegistrar.getCallCapablePhoneAccounts(handle.getScheme(), false, user,
isVideo ? PhoneAccount.CAPABILITY_VIDEO_CALLING : 0 /* any */,
isEmergency ? 0 : PhoneAccount.CAPABILITY_EMERGENCY_CALLS_ONLY);
- // First check the Radio SIM Technology
- if(mRadioSimVariants == null) {
- // Cache Sim Variants
- mRadioSimVariants = getTelephonyManager().getMultiSimConfiguration();
+ if (mMaxNumberOfSimultaneouslyActiveSims < 0) {
+ mMaxNumberOfSimultaneouslyActiveSims =
+ getTelephonyManager().getMaxNumberOfSimultaneouslyActiveSims();
}
// Only one SIM PhoneAccount can be active at one time for DSDS. Only that SIM PhoneAccount
- // Should be available if a call is already active on the SIM account.
- if(mRadioSimVariants != TelephonyManager.MultiSimVariants.DSDA) {
+ // should be available if a call is already active on the SIM account.
+ if (mMaxNumberOfSimultaneouslyActiveSims == 1) {
List<PhoneAccountHandle> simAccounts =
mPhoneAccountRegistrar.getSimPhoneAccountsOfCurrentUser();
PhoneAccountHandle ongoingCallAccount = null;
diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index 911cf0f..cf7abad 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -1033,6 +1033,7 @@
private final PhoneAccountRegistrar mPhoneAccountRegistrar;
private final CallsManager mCallsManager;
private final AppOpsManager mAppOpsManager;
+ private final Context mContext;
private ConnectionServiceFocusManager.ConnectionServiceFocusListener mConnSvrFocusListener;
@@ -1063,6 +1064,7 @@
mPhoneAccountRegistrar = phoneAccountRegistrar;
mCallsManager = callsManager;
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+ mContext = context;
}
/** See {@link IConnectionService#addConnectionServiceAdapter}. */
diff --git a/src/com/android/server/telecom/CreateConnectionProcessor.java b/src/com/android/server/telecom/CreateConnectionProcessor.java
index 84e97d9..72c06a3 100644
--- a/src/com/android/server/telecom/CreateConnectionProcessor.java
+++ b/src/com/android/server/telecom/CreateConnectionProcessor.java
@@ -103,7 +103,7 @@
if (manager == null) {
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
- return manager.getSubIdForPhoneAccount(account);
+ return manager.getSubscriptionId(account.getAccountHandle());
}
@Override
diff --git a/src/com/android/server/telecom/MissedCallNotifier.java b/src/com/android/server/telecom/MissedCallNotifier.java
index c4a09ee..0e5a287 100644
--- a/src/com/android/server/telecom/MissedCallNotifier.java
+++ b/src/com/android/server/telecom/MissedCallNotifier.java
@@ -20,7 +20,7 @@
import android.os.UserHandle;
import android.telecom.PhoneAccountHandle;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
/**
* Creates a notification for calls that the user missed (neither answered nor rejected).
diff --git a/src/com/android/server/telecom/PhoneAccountRegistrar.java b/src/com/android/server/telecom/PhoneAccountRegistrar.java
index 8776ffd..22568f1 100644
--- a/src/com/android/server/telecom/PhoneAccountRegistrar.java
+++ b/src/com/android/server/telecom/PhoneAccountRegistrar.java
@@ -195,7 +195,7 @@
if (account != null && account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
TelephonyManager tm =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
- return tm.getSubIdForPhoneAccount(account);
+ return tm.getSubscriptionId(accountHandle);
}
return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
}
@@ -356,7 +356,7 @@
if (newSubId != currentVoiceSubId) {
Log.i(this, "setUserSelectedOutgoingPhoneAccount: update voice sub; "
+ "account=%s, subId=%d", accountHandle, newSubId);
- mSubscriptionManager.setDefaultVoiceSubId(newSubId);
+ mSubscriptionManager.setDefaultVoiceSubscriptionId(newSubId);
}
} else {
Log.i(this, "setUserSelectedOutgoingPhoneAccount: %s is not a sub", accountHandle);
diff --git a/src/com/android/server/telecom/RespondViaSmsManager.java b/src/com/android/server/telecom/RespondViaSmsManager.java
index ac9ee3c..a709ae5 100644
--- a/src/com/android/server/telecom/RespondViaSmsManager.java
+++ b/src/com/android/server/telecom/RespondViaSmsManager.java
@@ -211,7 +211,7 @@
!TextUtils.isEmpty(contactName) ? contactName : phoneNumber,
messageParts.size());
context.registerReceiver(receiver, new IntentFilter(ACTION_MESSAGE_SENT));
- smsManager.sendMultipartTextMessageExternal(phoneNumber, null, messageParts,
+ smsManager.sendMultipartTextMessage(phoneNumber, null, messageParts,
sentIntents/*sentIntent*/, null /*deliveryIntent*/, context.getOpPackageName());
} catch (IllegalArgumentException e) {
Log.w(RespondViaSmsManager.this, "Couldn't send SMS message: " +
diff --git a/src/com/android/server/telecom/RingtoneFactory.java b/src/com/android/server/telecom/RingtoneFactory.java
index 42b1fb3..d3d2d0e 100644
--- a/src/com/android/server/telecom/RingtoneFactory.java
+++ b/src/com/android/server/telecom/RingtoneFactory.java
@@ -33,7 +33,7 @@
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import java.util.List;
diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index f04c825..cb70c99 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -598,7 +598,7 @@
.getSubscriptionIdForPhoneAccount(accountHandle);
}
}
- return getTelephonyManager().getVoiceMailNumber(subId);
+ return getTelephonyManager(subId).getVoiceMailNumber();
} catch (Exception e) {
Log.e(this, e, "getSubscriptionIdForPhoneAccount");
throw e;
@@ -633,7 +633,7 @@
subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(
accountHandle);
}
- return getTelephonyManager().getLine1Number(subId);
+ return getTelephonyManager(subId).getLine1Number();
} catch (Exception e) {
Log.e(this, e, "getSubscriptionIdForPhoneAccount");
throw e;
@@ -707,6 +707,31 @@
}
/**
+ * @param userId user id to get the default dialer package for
+ * @return the package name of the current user-selected default dialer. If no default
+ * has been selected, the package name of the system dialer is returned. If
+ * neither exists, then {@code null} is returned.
+ * @see android.telecom.TelecomManager#getDefaultDialerPackage
+ */
+ @Override
+ public String getDefaultDialerPackageForUser(int userId) {
+ try {
+ Log.startSession("TSI.gDDPU");
+ mContext.enforceCallingOrSelfPermission(READ_PRIVILEGED_PHONE_STATE,
+ "READ_PRIVILEGED_PHONE_STATE permission required.");
+
+ final long token = Binder.clearCallingIdentity();
+ try {
+ return mDefaultDialerCache.getDefaultDialerApplication(userId);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ } finally {
+ Log.endSession();
+ }
+ }
+
+ /**
* @see android.telecom.TelecomManager#getSystemDialerPackage
*/
@Override
@@ -950,7 +975,9 @@
long token = Binder.clearCallingIdentity();
boolean retval = false;
try {
- retval = getTelephonyManager().handlePinMmi(dialString);
+ retval = getTelephonyManager(
+ SubscriptionManager.getDefaultVoiceSubscriptionId())
+ .handlePinMmi(dialString);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -991,7 +1018,8 @@
subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(
accountHandle);
}
- retval = getTelephonyManager().handlePinMmiForSubscriber(subId, dialString);
+ retval = getTelephonyManager(subId)
+ .handlePinMmiForSubscriber(subId, dialString);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -2072,8 +2100,9 @@
}
}
- private TelephonyManager getTelephonyManager() {
- return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+ private TelephonyManager getTelephonyManager(int subId) {
+ return ((TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE))
+ .createForSubscriptionId(subId);
}
/**
diff --git a/src/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java b/src/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
index fbc79e6..be127a2 100644
--- a/src/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
+++ b/src/com/android/server/telecom/callfiltering/AsyncBlockCheckFilter.java
@@ -26,7 +26,7 @@
import android.telecom.Logging.Session;
import android.telecom.TelecomManager;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallerInfoLookupHelper;
import com.android.server.telecom.LogUtils;
diff --git a/src/com/android/server/telecom/callfiltering/BlockCheckerFilter.java b/src/com/android/server/telecom/callfiltering/BlockCheckerFilter.java
index 2cadb91..daf6be0 100644
--- a/src/com/android/server/telecom/callfiltering/BlockCheckerFilter.java
+++ b/src/com/android/server/telecom/callfiltering/BlockCheckerFilter.java
@@ -23,9 +23,9 @@
import android.os.HandlerThread;
import android.provider.BlockedNumberContract;
import android.provider.CallLog;
+import android.telecom.CallerInfo;
import android.telecom.Log;
import android.telecom.TelecomManager;
-import android.telephony.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallerInfoLookupHelper;
diff --git a/src/com/android/server/telecom/callfiltering/CallScreeningServiceController.java b/src/com/android/server/telecom/callfiltering/CallScreeningServiceController.java
index 249d878..181ff5c 100644
--- a/src/com/android/server/telecom/callfiltering/CallScreeningServiceController.java
+++ b/src/com/android/server/telecom/callfiltering/CallScreeningServiceController.java
@@ -29,7 +29,7 @@
import android.telephony.CarrierConfigManager;
import android.text.TextUtils;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallScreeningServiceHelper;
import com.android.server.telecom.CallerInfoLookupHelper;
diff --git a/src/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java b/src/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
index 8992a3b..71cb3e4 100644
--- a/src/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
+++ b/src/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
@@ -20,7 +20,7 @@
import android.provider.CallLog.Calls;
import android.telecom.Log;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallerInfoLookupHelper;
import com.android.server.telecom.LogUtils;
diff --git a/src/com/android/server/telecom/callfiltering/DirectToVoicemailFilter.java b/src/com/android/server/telecom/callfiltering/DirectToVoicemailFilter.java
index a361f2f..ab24d94 100644
--- a/src/com/android/server/telecom/callfiltering/DirectToVoicemailFilter.java
+++ b/src/com/android/server/telecom/callfiltering/DirectToVoicemailFilter.java
@@ -18,8 +18,8 @@
import android.net.Uri;
import android.provider.CallLog;
+import android.telecom.CallerInfo;
import android.telecom.Log;
-import android.telephony.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallerInfoLookupHelper;
diff --git a/src/com/android/server/telecom/callredirection/CallRedirectionProcessorHelper.java b/src/com/android/server/telecom/callredirection/CallRedirectionProcessorHelper.java
index 12c8c57..4126da0 100644
--- a/src/com/android/server/telecom/callredirection/CallRedirectionProcessorHelper.java
+++ b/src/com/android/server/telecom/callredirection/CallRedirectionProcessorHelper.java
@@ -151,7 +151,7 @@
String number = handle.getSchemeSpecificPart();
// Extract the post dial portion
- number = PhoneNumberUtils.extractNetworkPortionAlt(number);
+ number = PhoneNumberUtils.extractNetworkPortion(number);
Log.i(this, "removePostDialDigits, number after being extracted post dial digits: "
+ Log.pii(number));
// if there is a problem with parsing the phone number, removePostDialDigits will return
diff --git a/src/com/android/server/telecom/components/TelecomService.java b/src/com/android/server/telecom/components/TelecomService.java
index dcb366d..2acc548 100644
--- a/src/com/android/server/telecom/components/TelecomService.java
+++ b/src/com/android/server/telecom/components/TelecomService.java
@@ -29,7 +29,7 @@
import android.os.SystemClock;
import android.telecom.Log;
-import android.telephony.CallerInfoAsyncQuery;
+import android.telecom.CallerInfoAsyncQuery;
import com.android.server.telecom.AsyncRingtonePlayer;
import com.android.server.telecom.BluetoothAdapterProxy;
import com.android.server.telecom.BluetoothPhoneServiceImpl;
diff --git a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
index 66873c2..e64e67c 100644
--- a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
+++ b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
@@ -62,7 +62,7 @@
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import java.lang.Override;
import java.lang.String;
diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
index b8a5c19..5c7b357 100644
--- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java
+++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
@@ -38,8 +38,6 @@
import android.media.AudioManager;
import android.net.Uri;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
import android.os.Process;
import android.provider.BlockedNumberContract;
import android.telecom.Call;
@@ -59,7 +57,7 @@
import androidx.test.filters.FlakyTest;
import com.android.internal.telecom.IInCallAdapter;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.google.common.base.Predicate;
diff --git a/tests/src/com/android/server/telecom/tests/BlockCheckerFilterTest.java b/tests/src/com/android/server/telecom/tests/BlockCheckerFilterTest.java
index c9a4cef..7df4f29 100644
--- a/tests/src/com/android/server/telecom/tests/BlockCheckerFilterTest.java
+++ b/tests/src/com/android/server/telecom/tests/BlockCheckerFilterTest.java
@@ -32,7 +32,7 @@
import android.os.Bundle;
import android.os.PersistableBundle;
import android.provider.CallLog;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.test.suitebuilder.annotation.SmallTest;
diff --git a/tests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java b/tests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
index 16e6355..532cc7e 100644
--- a/tests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
+++ b/tests/src/com/android/server/telecom/tests/BluetoothPhoneServiceTest.java
@@ -246,7 +246,8 @@
nullable(PhoneAccountHandle.class))).thenReturn(null);
when(mMockPhoneAccountRegistrar.getPhoneAccountUnchecked(
nullable(PhoneAccountHandle.class))).thenReturn(null);
- when(TelephonyManager.from(mContext).getLine1Number()).thenReturn(fakeNumber);
+ when(mComponentContextFixture.getTelephonyManager().getLine1Number())
+ .thenReturn(fakeNumber);
String subscriberNumber = mBluetoothPhoneService.mBinder.getSubscriberNumber();
diff --git a/tests/src/com/android/server/telecom/tests/CallScreeningServiceControllerTest.java b/tests/src/com/android/server/telecom/tests/CallScreeningServiceControllerTest.java
index 59ea094..332899b 100644
--- a/tests/src/com/android/server/telecom/tests/CallScreeningServiceControllerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallScreeningServiceControllerTest.java
@@ -34,7 +34,7 @@
import android.telephony.CarrierConfigManager;
import android.test.suitebuilder.annotation.SmallTest;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallScreeningServiceHelper;
import com.android.server.telecom.CallerInfoLookupHelper;
diff --git a/tests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java b/tests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
index 75ad3c6..c469dbc 100644
--- a/tests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
+++ b/tests/src/com/android/server/telecom/tests/CallerInfoAsyncQueryFactoryFixture.java
@@ -16,8 +16,8 @@
package com.android.server.telecom.tests;
-import android.telephony.CallerInfo;
-import android.telephony.CallerInfoAsyncQuery;
+import android.telecom.CallerInfo;
+import android.telecom.CallerInfoAsyncQuery;
import com.android.server.telecom.CallerInfoAsyncQueryFactory;
import android.content.Context;
diff --git a/tests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java b/tests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
index a93b8a4..7c001c0 100644
--- a/tests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallerInfoLookupHelperTest.java
@@ -37,8 +37,8 @@
import androidx.test.InstrumentationRegistry;
-import android.telephony.CallerInfo;
-import android.telephony.CallerInfoAsyncQuery;
+import android.telecom.CallerInfo;
+import android.telecom.CallerInfoAsyncQuery;
import com.android.server.telecom.CallerInfoAsyncQueryFactory;
import com.android.server.telecom.CallerInfoLookupHelper;
import com.android.server.telecom.ContactsAsyncHelper;
diff --git a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
index 161823e..71ad721 100644
--- a/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/CallsManagerTest.java
@@ -49,7 +49,7 @@
import android.test.suitebuilder.annotation.MediumTest;
import android.test.suitebuilder.annotation.SmallTest;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.AsyncRingtonePlayer;
import com.android.server.telecom.Call;
import com.android.server.telecom.CallAudioManager;
@@ -1150,8 +1150,7 @@
private void setupMsimAccounts() {
TelephonyManager mockTelephonyManager = mComponentContextFixture.getTelephonyManager();
- when(mockTelephonyManager.getMultiSimConfiguration()).thenReturn(
- TelephonyManager.MultiSimVariants.DSDS);
+ when(mockTelephonyManager.getMaxNumberOfSimultaneouslyActiveSims()).thenReturn(1);
when(mPhoneAccountRegistrar.getCallCapablePhoneAccounts(any(), anyBoolean(),
any(), anyInt(), anyInt())).thenReturn(
new ArrayList<>(Arrays.asList(SIM_1_HANDLE, SIM_2_HANDLE)));
diff --git a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
index e6e8ba1..dcd0607 100644
--- a/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
+++ b/tests/src/com/android/server/telecom/tests/ComponentContextFixture.java
@@ -502,12 +502,12 @@
// Used in CreateConnectionProcessor to rank emergency numbers by viability.
// For the test, make them all equal to INVALID so that the preferred PhoneAccount will be
// chosen.
- when(mTelephonyManager.getSubIdForPhoneAccount((PhoneAccount) any())).thenReturn(
+ when(mTelephonyManager.getSubscriptionId(any())).thenReturn(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
when(mTelephonyManager.getNetworkOperatorName()).thenReturn("label1");
- when(mTelephonyManager.getMultiSimConfiguration()).thenReturn(
- TelephonyManager.MultiSimVariants.UNKNOWN);
+ when(mTelephonyManager.getMaxNumberOfSimultaneouslyActiveSims()).thenReturn(1);
+ when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
when(mResources.getBoolean(eq(R.bool.grant_location_permission_enabled))).thenReturn(false);
doAnswer(new Answer<Void>(){
@Override
diff --git a/tests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java b/tests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
index 4502da7..a55f9b5 100644
--- a/tests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
+++ b/tests/src/com/android/server/telecom/tests/DirectToVoicemailCallFilterTest.java
@@ -20,7 +20,7 @@
import android.provider.CallLog.Calls;
import android.test.suitebuilder.annotation.SmallTest;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.Call;
import com.android.server.telecom.callfiltering.CallFilterResultCallback;
import com.android.server.telecom.CallerInfoLookupHelper;
diff --git a/tests/src/com/android/server/telecom/tests/DirectToVoicemailFilterTest.java b/tests/src/com/android/server/telecom/tests/DirectToVoicemailFilterTest.java
index 43aa8e2..2ab4e78 100644
--- a/tests/src/com/android/server/telecom/tests/DirectToVoicemailFilterTest.java
+++ b/tests/src/com/android/server/telecom/tests/DirectToVoicemailFilterTest.java
@@ -23,9 +23,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.telephony.CallerInfo;
import android.net.Uri;
import android.provider.CallLog;
+import android.telecom.CallerInfo;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.server.telecom.Call;
diff --git a/tests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java b/tests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
index 101bf97..fa59059 100644
--- a/tests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
+++ b/tests/src/com/android/server/telecom/tests/MissedCallNotifierImplTest.java
@@ -39,7 +39,7 @@
import android.telephony.TelephonyManager;
import android.test.suitebuilder.annotation.SmallTest;
-import android.telephony.CallerInfo;
+import android.telecom.CallerInfo;
import com.android.server.telecom.CallerInfoLookupHelper;
import com.android.server.telecom.Constants;
import com.android.server.telecom.DefaultDialerCache;
diff --git a/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java b/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
index 7d1bef7..890fa6f 100644
--- a/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
+++ b/tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java
@@ -850,7 +850,7 @@
TelephonyManager mockTelephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
- when(mockTelephonyManager.getVoiceMailNumber(subId)).thenReturn(vmNumber);
+ when(mockTelephonyManager.getVoiceMailNumber()).thenReturn(vmNumber);
assertEquals(vmNumber, mTSIBinder.getVoiceMailNumber(null, DEFAULT_DIALER_PACKAGE));
}
@@ -866,7 +866,7 @@
TelephonyManager mockTelephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
- when(mockTelephonyManager.getVoiceMailNumber(subId)).thenReturn(vmNumber);
+ when(mockTelephonyManager.getVoiceMailNumber()).thenReturn(vmNumber);
when(mFakePhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(TEL_PA_HANDLE_CURRENT))
.thenReturn(subId);
@@ -884,7 +884,7 @@
.thenReturn(subId);
TelephonyManager mockTelephonyManager =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
- when(mockTelephonyManager.getLine1Number(subId)).thenReturn(line1Number);
+ when(mockTelephonyManager.getLine1Number()).thenReturn(line1Number);
assertEquals(line1Number,
mTSIBinder.getLine1Number(TEL_PA_HANDLE_CURRENT, DEFAULT_DIALER_PACKAGE));