commit 327d0f71622edb0135684da4b6f39ab46460c5ae
author Hyosun Kim <hyosunkim@google.com> Tue May 28 09:50:59 2024 +0000
committer Hyosun Kim <hyosunkim@google.com> Tue Jun 04 04:08:14 2024 +0000
tree 1d38e9f2330d906d6ce9992334965484f93203dd
parent 42e9a1963fb210e5d004236205a58acf56cd94cb

Add count of incomingMms, outgoingMms in CarrierRoamingSatelliteSession

Bug: 339111754
Test: manual test - check logging b/339111754#comment27

Change-Id: Icbba539c44a532ff180f87398668502fe8e2f839

Android.bp

diff --git a/Android.bp b/Android.bp
index b586dc6..ba2674a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,6 +39,7 @@
     platform_apis: true,
     privileged: true,
     srcs: ["src/**/*.java"],
+    libs: ["telephony-common"],
     resource_dirs: ["res"],
     aaptflags: ["--auto-add-overlay"],
     optimize: {

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 604d9de..9ddce57 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -356,7 +356,7 @@
                 }
                 reportPossibleAnomaly(result, httpStatusCode);
                 pendingIntent.send(context, result, fillIn);
-                mMmsStats.addAtomToStorage(result, retryId, handledByCarrierApp);
+                mMmsStats.addAtomToStorage(result, retryId, handledByCarrierApp, mMessageId);
             } catch (PendingIntent.CanceledException e) {
                 LogUtil.e(requestId, "Sending pending intent canceled", e);
             }

src/com/android/mms/service/metrics/MmsStats.java

diff --git a/src/com/android/mms/service/metrics/MmsStats.java b/src/com/android/mms/service/metrics/MmsStats.java
index 6df9f79..dec5129 100644
--- a/src/com/android/mms/service/metrics/MmsStats.java
+++ b/src/com/android/mms/service/metrics/MmsStats.java
@@ -37,6 +37,7 @@
 
 import com.android.internal.telephony.SmsApplication;
 import com.android.internal.telephony.flags.Flags;
+import com.android.internal.telephony.satellite.metrics.CarrierRoamingSatelliteSessionStats;
 import com.android.mms.IncomingMms;
 import com.android.mms.OutgoingMms;
 
@@ -73,11 +74,12 @@
 
     /** Adds incoming or outgoing mms atom to storage. */
     public void addAtomToStorage(int result) {
-        addAtomToStorage(result, 0, false);
+        addAtomToStorage(result, 0, false, 0);
     }
 
     /** Adds incoming or outgoing mms atom to storage. */
-    public void addAtomToStorage(int result, int retryId, boolean handledByCarrierApp) {
+    public void addAtomToStorage(int result, int retryId, boolean handledByCarrierApp,
+            long mMessageId) {
         long identity = Binder.clearCallingIdentity();
         try {
             if (mIsIncomingMms) {
@@ -85,6 +87,11 @@
             } else {
                 onOutgoingMms(result, retryId, handledByCarrierApp);
             }
+            if (isUsingNonTerrestrialNetwork()) {
+                CarrierRoamingSatelliteSessionStats carrierRoamingSatelliteSessionStats =
+                        CarrierRoamingSatelliteSessionStats.getInstance(mSubId);
+                carrierRoamingSatelliteSessionStats.onMms(mIsIncomingMms, mMessageId);
+            }
         } finally {
             Binder.restoreCallingIdentity(identity);
         }

tests/unittests/Android.bp

diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp
index ced87a9..add4f69 100644
--- a/tests/unittests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -19,6 +19,7 @@
         "android.test.runner",
         "android.test.base",
         "android.test.mock",
+        "telephony-common",
     ],
     srcs: [
         "src/**/*.java",