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

Commit 9d9480aa authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Automerger Merge Worker
Browse files

Merge "Add anomaly reports to check if IMEI is null." into tm-qpr-dev am: 35d55a58 am: e7ad0777 

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



Change-Id: I543b17b6755da8f8e21755e14cb057f2c7513257
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b0cf3e0 e7ad0777

telephony/java/android/telephony/TelephonyManager.java

+12 −2
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ 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.










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













    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM)















    public String getImei() {













        return getImei(getSlotIndex());













        String imei = getImei(getSlotIndex());













        if (imei == null) {













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













        }













        return imei;















    }





























    /**










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













    @RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM)















    public String getImei(int slotIndex) {















        ITelephony telephony = getITelephony();













        if (telephony == null) return null;













        if (telephony == null) {













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













            return null;













        }





























        try {















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