Merge "Returns null not empty string if MEID is not available"

am: 634c108060 Change-Id: I75230fdc0f1014f5fc5d3e986c951bf5ece4d545
2019-10-29 17:45:25 -07:00
parent 29ef902835 634c108060
commit 02445f14da
1 changed files with 6 additions and 1 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1887,7 +1887,12 @@ public class TelephonyManager {
        if (telephony == null) return null;

        try {
-            return telephony.getMeidForSlot(slotIndex, getOpPackageName());
+            String meid = telephony.getMeidForSlot(slotIndex, getOpPackageName());
+            if (TextUtils.isEmpty(meid)) {
+                Log.d(TAG, "getMeid: return null because MEID is not available");
+                return null;
+            }
+            return meid;
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {