From fb207fff5b9d96675e3309c23ab76e6d46cf3a25 Mon Sep 17 00:00:00 2001 From: Aishwarya Mallampati Date: Tue, 20 Sep 2022 21:31:44 +0000 Subject: [PATCH] Revert "Add anomaly reports to check if IMEI is null." This reverts commit 58e9f0004c31c19d67ab099c5a5297c91edd6fd9. Reason for revert: broken cts test b/247843841 Change-Id: I3df323704688510cb8fd17b8e0eb7b3d4febce7e --- .../java/android/telephony/TelephonyManager.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c79fe14a89fa0..b6f86527b7477 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -190,9 +190,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. @@ -2135,11 +2132,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()); } /** @@ -2182,10 +2175,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());