expose carrier id APIs and clean up
Bug: 110559381
Test: unit test
Change-Id: I7d3004342ff2f9e13474e29b74fff4533e1d1585
Merged-in: I7d3004342ff2f9e13474e29b74fff4533e1d1585
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]);
}
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();