Merge "Returns null not empty string if MEID is not available" am: 634c108060

am: 02445f14da Change-Id: Iad4251e00f28f1e051bc6af79cbdb3179230442d
2019-10-29 17:57:11 -07:00
parent 432cf72f81 02445f14da
commit 7a318f0646
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) {