commit e6242670fbab08204e6b62bcc0adccadeb077c19
author Calvin Pan <calvinpan@google.com> Mon Nov 12 10:24:03 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 12 10:24:03 2018 -0800
tree 2e6916f448ba88953a6fa9240430cd7627bb476d
parent c0bbd4abfcf1c3224f90de241b1caf64663297c0
parent 6a4940773f11c61199faf61373655809ee542bb5

Merge "Create new API for MNO carrier id"
am: 6a4940773f

Change-Id: I39adab37bb363a1b8bf6d0243bf1b70e6dbd1415

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c44f7db..6ce8784 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -54,7 +54,6 @@
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
-import android.telephony.emergency.EmergencyNumber;
 import android.telephony.CarrierConfigManager;
 import android.telephony.CellInfo;
 import android.telephony.CellInfoGsm;
@@ -79,6 +78,7 @@
 import android.telephony.UssdResponse;
 import android.telephony.VisualVoicemailSmsFilterSettings;
 import android.telephony.cdma.CdmaCellLocation;
+import android.telephony.emergency.EmergencyNumber;
 import android.telephony.gsm.GsmCellLocation;
 import android.telephony.ims.aidl.IImsCapabilityCallback;
 import android.telephony.ims.aidl.IImsConfig;
@@ -2058,6 +2058,17 @@
         }
     }
 
+    @Override
+    public int getSubscriptionMNOCarrierId(int subId) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return phone == null ? TelephonyManager.UNKNOWN_CARRIER_ID : phone.getMNOCarrierId();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
     //
     // Internal helper methods.
     //