| commit | 1c8960a480cc287d2445e35fddac4aa89e99441c | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Fri Nov 08 17:26:23 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 08 17:26:23 2019 -0800 |
| tree | edae8fa120ee94e602303a4facdc25f02e968738 | |
| parent | b460b58464ae9e65dc1434a6cf005f3e57c2049e [diff] | |
| parent | ce68570fa6c398562069d76af75e2362cf15a07a [diff] |
Merge changes from topic "tp-master-security" am: ce68570fa6 Change-Id: I1d406b5875239d4e192ad2f3bffcfda0c018111a
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; }