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

Commit f26a08f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add anomaly reports to check if IMEI is null."" into tm-qpr-dev... 

Merge "Revert "Add anomaly reports to check if IMEI is null."" into tm-qpr-dev am: a443c8bd am: cedd8daf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19991894



Change-Id: I63433403b3dd98c7fc629f12bd2d669aef2b7db4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9a45e67 cedd8daf

telephony/java/android/telephony/TelephonyManager.java

+2 −12
Original line number Diff line number Diff line
@@ -191,9 +191,6 @@ public class TelephonyManager { 
    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)

    private static final long CALLBACK_ON_MORE_ERROR_CODE_CHANGE = 130595455L;













    // Null IMEI anomaly uuid













    private static final UUID IMEI_ANOMALY_UUID = UUID.fromString(













            "83905f14-6455-450c-be29-8206f0427fe9");















    /**















     * The key to use when placing the result of {@link #requestModemActivityInfo(ResultReceiver)}















     * into the ResultReceiver Bundle.










@@ -2184,11 +2181,7 @@ public class TelephonyManager {













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM)















    public String getImei() {













        String imei = getImei(getSlotIndex());













        if (imei == null) {













            AnomalyReporter.reportAnomaly(IMEI_ANOMALY_UUID, "getImei: IMEI is null.");













        }













        return imei;













        return getImei(getSlotIndex());















    }





























    /**










@@ -2231,10 +2224,7 @@ public class TelephonyManager {













    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM)















    public String getImei(int slotIndex) {















        ITelephony telephony = getITelephony();













        if (telephony == null) {













            AnomalyReporter.reportAnomaly(IMEI_ANOMALY_UUID, "getImei: telephony is null");













            return null;













        }













        if (telephony == null) return null;





























        try {















            return telephony.getImeiForSlot(slotIndex, getOpPackageName(), getAttributionTag());