commit 4fd3e37b4a6b6f8422f2eda664fce34b76c620ec
author Kiwon Park <kiwonp@google.com> Thu May 12 17:01:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 12 17:01:04 2022 +0000
tree 0a334d9d39f55cb63e55283f6a75565480425c4c
parent 325458ce538b49dea1a284775e0dc1e7376dfbcc
parent 2bfc10a8af4f49da5dc1f9b5373972496aa26a61

Populate carrier id in anomaly reports. am: 2bfc10a8af

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Mms/+/18177290

Change-Id: Ib92e0ee7c124ae6696265e23aa4973eaf531f12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/mms/service/MmsRequest.java

diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index 4c7b4c7..dfef1cc 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -27,15 +27,14 @@
 import android.service.carrier.CarrierMessagingService;
 import android.service.carrier.CarrierMessagingServiceWrapper.CarrierMessagingCallback;
 import android.telephony.AnomalyReporter;
-import android.telephony.PhoneStateListener;
 import android.telephony.PreciseDataConnectionState;
-import android.telephony.TelephonyCallback;
-import android.telephony.data.ApnSetting;
-import android.telephony.ims.feature.MmTelFeature;
-import android.telephony.ims.ImsMmTelManager;
-import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.telephony.SmsManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
+import android.telephony.data.ApnSetting;
+import android.telephony.ims.ImsMmTelManager;
+import android.telephony.ims.feature.MmTelFeature;
+import android.telephony.ims.stub.ImsRegistrationImplBase;
 
 import com.android.mms.service.exception.ApnException;
 import com.android.mms.service.exception.MmsHttpException;
@@ -299,7 +298,13 @@
                 String message = "MMS failed";
                 LogUtil.i(this.toString(),
                         message + " with error: " + result + " httpStatus:" + httpStatusCode);
-                AnomalyReporter.reportAnomaly(generateUUID(result, httpStatusCode), message);
+                TelephonyManager telephonyManager =
+                        mContext.getSystemService(TelephonyManager.class)
+                                .createForSubscriptionId(mSubId);
+                AnomalyReporter.reportAnomaly(
+                        generateUUID(result, httpStatusCode),
+                        message,
+                        telephonyManager.getSimCarrierId());
                 break;
             default:
                 break;