commit a118a4a772c86a4f044a2b817961970ba8368fbf
author Chen Xu <fionaxu@google.com> Mon Dec 17 20:56:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 17 20:56:54 2018 +0000
tree 067e5b1c3d4707b11416c50947934b01907e8ea6
parent 5a5c2062f07556672d82b26e51575a95f3f143d4
parent 6a02cf249d8faeb946e7673d427745dfb14dd451

Merge "expose carrier id APIs and clean up"

src/com/android/providers/telephony/CarrierIdProvider.java

diff --git a/src/com/android/providers/telephony/CarrierIdProvider.java b/src/com/android/providers/telephony/CarrierIdProvider.java
index 7f2de12..77093a6 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -644,8 +644,6 @@
                 row.add(mCurrentSubscriptionMap.get(subId).get(CarrierId.CARRIER_ID));
             } else if (CarrierId.CARRIER_NAME.equals(columnName)) {
                 row.add(mCurrentSubscriptionMap.get(subId).get(CarrierId.CARRIER_NAME));
-            } else if (CarrierId.MNO_CARRIER_ID.equals(columnName)) {
-                row.add(mCurrentSubscriptionMap.get(subId).get(CarrierId.MNO_CARRIER_ID));
             } else {
                 throw new IllegalArgumentException("Invalid column " + projectionIn[i]);
             }

tests/src/com/android/providers/telephony/TelephonyProviderTest.java

diff --git a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
index b77e5cf..c34e48a 100644
--- a/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
+++ b/tests/src/com/android/providers/telephony/TelephonyProviderTest.java
@@ -1502,12 +1502,10 @@
         final String numeric = TEST_OPERATOR;
         final String mvnoData = TelephonyProviderTestable.TEST_SPN;
         final int carrierId = 100;
-        final int mnoCarrierId = 101;
 
         doReturn(carrierId).when(telephonyManager).getSimCarrierId();
         doReturn(numeric).when(telephonyManager).getSimOperator();
         doReturn(mvnoData).when(telephonyManager).getSimOperatorName();
-        doReturn(mnoCarrierId).when(telephonyManager).getSimMNOCarrierId();
 
         // Insert the APN and DB only have the MNO APN
         ContentValues contentValues = new ContentValues();