commit 8ef973bcbf89b23838054735e5e3179eb42e1609
author Chen Xu <fionaxu@google.com> Wed Dec 12 18:02:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 12 18:02:53 2018 +0000
tree 76260bc6ae11416acfc400ea6522572bd7152671
parent 296825f4a1b8cf3d303966b0fb35ddcee74d30df
parent a7e124604984fcfb9339e05ffee123bf36244375

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 6dfa07b..472f0e1 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -645,8 +645,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]);
             }