| commit | f2461ab96d409909f3f9ee66e1846830d3191aba | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 23:18:44 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 23:18:44 2019 -0700 |
| tree | 089d19642c7ac39b432be5218d13022b49d30014 | |
| parent | 083abd3fa01ae176b2af94376c0fbbf25f824c9a [diff] | |
| parent | 03a210e8c30e71597f09523734ac738a2a8ced59 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 5de450023f -s ours am: bbd3513db0 -s ours am: 03a210e8c3 -s ours am skip reason: change_id I9fc77bfb2ee9c2a7567dc3645cf8cf436388e975 with SHA1 2a16dc6aa2 is in history Change-Id: Icb7daeaf6156e47b136a84076d371302498555f0
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; }