Merge "Copy functionality into calling location from ApnSetting."
am: cddf7e9ca3
Change-Id: Ia4f0bd24546f4ed1f1ebba4c3fe95c0054c3eb56
diff --git a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
index b996dc3..47c1dc6 100644
--- a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
@@ -152,9 +152,9 @@
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
doReturn(TEST_OPERATOR).when(mTelephonyManager).getSimOperator();
- doReturn(mIcRecords).when(mUiccController).getIccRecords(anyInt(),
- ArgumentMatchers.eq(UiccController.APP_FAM_3GPP));
+ doReturn(mIcRecords).when(mUiccController).getIccRecords(anyInt(), anyInt());
doReturn(TEST_SPN).when(mIcRecords).getServiceProviderName();
+ doReturn(TEST_SPN).when(mIcRecords).getServiceProviderNameWithBrandOverride();
// Add authority="telephony" to given telephonyProvider
ProviderInfo providerInfo = new ProviderInfo();
diff --git a/tests/src/com/android/providers/telephony/TelephonyProviderTestable.java b/tests/src/com/android/providers/telephony/TelephonyProviderTestable.java
index 6c2371d..d9f6ee3 100644
--- a/tests/src/com/android/providers/telephony/TelephonyProviderTestable.java
+++ b/tests/src/com/android/providers/telephony/TelephonyProviderTestable.java
@@ -92,6 +92,7 @@
Log.d(TAG, "getIccRecords called");
IccRecords iccRecords = mock(IccRecords.class);
doReturn(TEST_SPN).when(iccRecords).getServiceProviderName();
+ doReturn(TEST_SPN).when(iccRecords).getServiceProviderNameWithBrandOverride();
return iccRecords;
}