commit f7e8f15a7c0a87bb7ddef0d9c36f6a6982c748cb
author Jack Yu <jackyu@google.com> Wed Mar 15 17:14:14 2017 -0700
committer Jack Yu <jackyu@google.com> Thu Mar 23 11:10:42 2017 -0700
tree 1de0060596319d333a13552bbbd3a0198e15173a
parent 4c13a10afc08fe7d3bb163e9fe524e3fcda37feb

Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Change-Id: If3d9fc71751fe14cf92afb685146faea983ffde3

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fc7faab..7e211b6 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1716,6 +1716,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;