Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic1cbba71d5e5437b59177b8102e95e083edc1358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aishwarya Mallampati
2022-09-20 16:43:18 +00:00
committed by Automerger Merge Worker
parent cdfc10ba18 35d55a58cc
commit e7ad077775
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -190,6 +190,9 @@ public class TelephonyManager {
@EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q) @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)
private static final long CALLBACK_ON_MORE_ERROR_CODE_CHANGE = 130595455L; 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)} * The key to use when placing the result of {@link #requestModemActivityInfo(ResultReceiver)}
* into the ResultReceiver Bundle. * into the ResultReceiver Bundle.
@@ -2132,7 +2135,11 @@ public class TelephonyManager {
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM) @RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM)
public String getImei() { public String getImei() {
return getImei(getSlotIndex()); String imei = getImei(getSlotIndex());
if (imei == null) {
AnomalyReporter.reportAnomaly(IMEI_ANOMALY_UUID, "getImei: IMEI is null.");
}
return imei;
} }
/** /**
@@ -2175,7 +2182,10 @@ public class TelephonyManager {
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM) @RequiresFeature(PackageManager.FEATURE_TELEPHONY_GSM)
public String getImei(int slotIndex) { public String getImei(int slotIndex) {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony == null) return null; if (telephony == null) {
AnomalyReporter.reportAnomaly(IMEI_ANOMALY_UUID, "getImei: telephony is null");
return null;
}
try { try {
return telephony.getImeiForSlot(slotIndex, getOpPackageName(), getAttributionTag()); return telephony.getImeiForSlot(slotIndex, getOpPackageName(), getAttributionTag());