| commit | 961f3663ab9f0316d38bebf654305e7214ecf2e6 | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Fri Oct 18 18:53:34 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 18 18:53:34 2019 -0700 |
| tree | de524670d953a27b201360cfee435f931e8041bc | |
| parent | 61798134a8d7dc7676d4545e65413b62019b0088 [diff] | |
| parent | 3e9f16d0e8552ffced88c182381c8e44043fe8aa [diff] |
Merge "Add sarahchin to OWNERS" am: 5ae1ab9935 am: 8b8eea4e26 am: 3e9f16d0e8 Change-Id: I2eaf3fabda586d603f597519c96fd287d67a9f12
diff --git a/assets/carrier_list.pb b/assets/carrier_list.pb index 93bc1b3..0c5e5b9 100644 --- a/assets/carrier_list.pb +++ b/assets/carrier_list.pb Binary files differ
diff --git a/assets/carrier_list.textpb b/assets/carrier_list.textpb index 1e033ee..ab01907 100644 --- a/assets/carrier_list.textpb +++ b/assets/carrier_list.textpb Binary files differ
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; }