Fixed the failed unit tests
Fix: 268761296
Test: atest PhoneInterfaceManagerTest
Change-Id: Ie95a08b766923b2eb8946b4e53a026ca567e8c9f
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5ec4f65..bab5ad3 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6041,7 +6041,7 @@
private boolean isActiveSubscription(int subId) {
if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {
- return SubscriptionManagerService.getInstance().isActiveSubId(subId,
+ return getSubscriptionManagerService().isActiveSubId(subId,
mApp.getOpPackageName(), mApp.getFeatureId());
}
return mSubscriptionController.isActiveSubId(subId);
@@ -8007,7 +8007,7 @@
ParcelUuid groupUuid;
if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {
- final SubscriptionInfo info = SubscriptionManagerService.getInstance()
+ final SubscriptionInfo info = getSubscriptionManagerService()
.getSubscriptionInfo(subId);
groupUuid = info.getGroupUuid();
} else {
@@ -8024,7 +8024,7 @@
final List<String> mergedSubscriberIds = new ArrayList<>();
List<SubscriptionInfo> groupInfos;
if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {
- groupInfos = SubscriptionManagerService.getInstance()
+ groupInfos = getSubscriptionManagerService()
.getSubscriptionsInGroup(groupUuid, mApp.getOpPackageName(),
mApp.getAttributionTag());
} else {
@@ -8594,7 +8594,7 @@
try {
SubscriptionInfo info;
if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {
- info = SubscriptionManagerService.getInstance().getActiveSubscriptionInfo(subId,
+ info = getSubscriptionManagerService().getActiveSubscriptionInfo(subId,
phone.getContext().getOpPackageName(),
phone.getContext().getAttributionTag());
if (info == null) {
@@ -8661,7 +8661,7 @@
*/
private List<SubscriptionInfo> getActiveSubscriptionInfoListPrivileged() {
if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {
- return SubscriptionManagerService.getInstance().getActiveSubscriptionInfoList(
+ return getSubscriptionManagerService().getActiveSubscriptionInfoList(
mApp.getOpPackageName(), mApp.getAttributionTag());
}
return mSubscriptionController.getActiveSubscriptionInfoList(mApp.getOpPackageName(),
@@ -8876,7 +8876,7 @@
try {
// isActiveSubId requires READ_PHONE_STATE, which we already check for above
if (PhoneFactory.isSubscriptionManagerServiceEnabled()) {
- SubscriptionInfoInternal subInfo = SubscriptionManagerService.getInstance()
+ SubscriptionInfoInternal subInfo = getSubscriptionManagerService()
.getSubscriptionInfoInternal(subId);
if (subInfo == null || !subInfo.isActive()) {
Rlog.d(LOG_TAG, "getServiceStateForSubscriber returning null for inactive "
@@ -13190,6 +13190,13 @@
}
/**
+ * @return The subscription manager service instance.
+ */
+ public SubscriptionManagerService getSubscriptionManagerService() {
+ return SubscriptionManagerService.getInstance();
+ }
+
+ /**
* Class binds the consumer[callback] and carrierId.
*/
private static class CallerCallbackInfo {
@@ -13209,4 +13216,4 @@
return mCarrierId;
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
index 4cc793d..e702279 100644
--- a/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
+++ b/tests/src/com/android/phone/PhoneInterfaceManagerTest.java
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -42,9 +41,10 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.TelephonyTestBase;
+import com.android.internal.telephony.IIntegerConsumer;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.RILConstants;
-import com.android.internal.telephony.IIntegerConsumer;
+import com.android.internal.telephony.subscription.SubscriptionManagerService;
import org.junit.Before;
import org.junit.Test;
@@ -54,7 +54,7 @@
import java.util.Locale;
/**
- * Unit Test for CarrierConfigLoader.
+ * Unit Test for PhoneInterfaceManager.
*/
@RunWith(AndroidJUnit4.class)
public class PhoneInterfaceManagerTest extends TelephonyTestBase {
@@ -67,6 +67,9 @@
@Mock
Phone mPhone;
+ @Mock
+ private SubscriptionManagerService mSubscriptionManagerService;
+
@Before
@UiThreadTest
public void setUp() throws Exception {
@@ -76,6 +79,9 @@
// alive on a test devices. You must use the spy to mock behavior. Mocks stemming from the
// passed context will remain unused.
mPhoneInterfaceManager = spy(PhoneInterfaceManager.init(mPhoneGlobals));
+ doReturn(mSubscriptionManagerService).when(mPhoneInterfaceManager)
+ .getSubscriptionManagerService();
+ TelephonyManager.setupISubForTest(mSubscriptionManagerService);
mSharedPreferences = mPhoneInterfaceManager.getSharedPreferences();
mSharedPreferences.edit().remove(Phone.PREF_NULL_CIPHER_AND_INTEGRITY_ENABLED).commit();
mIIntegerConsumer = mock(IIntegerConsumer.class);