commit 5bfc6df85cd24afc3b7dd592d98010344d94e8d0
author Jack Yu <jackyu@google.com> Fri Mar 24 17:11:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 24 17:11:10 2017 +0000
tree 92a33c3ff1e51bdce544d218726f3d68137dc5f7
parent efc12de11123d052dcd07dcd78568ac0e8c94c55
parent 3942335882b8bd0c211976cff4da5cbe5f2ebee7

Merge "Deprecated getDeviceId and added getMeid and getImei"
am: 3942335882

Change-Id: I2e6ed9bd8e1d416a4b47e7e4141baf07a26adf06

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ebe9315..89e484a 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1717,6 +1717,15 @@
     }
 
     @Override
+    public String getMeidForSlot(int slotIndex, String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getMeidForSlot")) {
+            return null;
+        }
+        Phone phone = PhoneFactory.getPhone(slotIndex);
+        return phone == null ? null : phone.getMeid();
+    }
+
+    @Override
     public String getDeviceSoftwareVersionForSlot(int slotIndex, String callingPackage) {
       if (!canReadPhoneState(callingPackage, "getDeviceSoftwareVersionForSlot")) {
           return null;