| commit | 1f816647a1ae67c237612478f35b1dd10ad0c701 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 09 07:44:38 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 09 07:44:38 2021 +0000 |
| tree | 6a8017cd8f0af09f46d6a572997f8cbcf4b1143d | |
| parent | fe435b65e4fe186f3e4402939b2f454f35440cea [diff] | |
| parent | c92765b5bc47b96d12bf11c905d7b94da03c2905 [diff] |
Merge "Update owners file"
diff --git a/assets/latest_carrier_id/carrier_list.pb b/assets/latest_carrier_id/carrier_list.pb index 3bb6f2b..c19db3a 100644 --- a/assets/latest_carrier_id/carrier_list.pb +++ b/assets/latest_carrier_id/carrier_list.pb Binary files differ
diff --git a/assets/latest_carrier_id/carrier_list.textpb b/assets/latest_carrier_id/carrier_list.textpb index 75e0864..4c7523a 100644 --- a/assets/latest_carrier_id/carrier_list.textpb +++ b/assets/latest_carrier_id/carrier_list.textpb Binary files differ
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index 0ff9fc6..e3aac6d 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -3939,7 +3939,7 @@ .createForSubscriptionId(subId); SQLiteDatabase db = getReadableDatabase(); String mccmnc = tm.getSimOperator(); - int carrierId = tm.getSimCarrierId(); + int carrierId = tm.getSimSpecificCarrierId(); qb.appendWhereStandalone(IS_NOT_USER_DELETED + " and " + IS_NOT_USER_DELETED_BUT_PRESENT_IN_XML + " and " +
diff --git a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java index 1a9b46c..35e532f 100644 --- a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java +++ b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
@@ -257,7 +257,7 @@ .isActiveSubscriptionId(anyInt()); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt()); doReturn(TEST_OPERATOR).when(mTelephonyManager).getSimOperator(); - doReturn(TEST_CARRIERID).when(mTelephonyManager).getSimCarrierId(); + doReturn(TEST_CARRIERID).when(mTelephonyManager).getSimSpecificCarrierId(); // Add authority="telephony" to given telephonyProvider ProviderInfo providerInfo = new ProviderInfo();