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

am: 7a318f0646 Change-Id: I41b8c9de8c7bd0c2a93c9f8444e77af84c50c293
2019-10-29 18:08:05 -07:00
parent 4a4c2aec28 7a318f0646
commit 43bc62b8c8
1 changed files with 6 additions and 1 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1873,7 +1873,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) {