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

Commit 43bc62b8 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 

am: 7a318f06

Change-Id: I41b8c9de8c7bd0c2a93c9f8444e77af84c50c293
parents 4a4c2aec 7a318f06

telephony/java/android/telephony/TelephonyManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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) {