Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a318f06 authored by Ruijie Bai's avatar Ruijie Bai Committed by android-build-merger
Browse files

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

am: 02445f14

Change-Id: Iad4251e00f28f1e051bc6af79cbdb3179230442d
parents 432cf72f 02445f14
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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) {