diff options
| author | Jordan Liu <jminjie@google.com> | 2020-05-28 15:57:28 -0700 |
|---|---|---|
| committer | Jordan Liu <jminjie@google.com> | 2020-05-29 09:38:45 -0700 |
| commit | 86e0554982dd34959ade84b498b859622b055a72 (patch) | |
| tree | 02232e801efdd7de1a375d84ef08dc07827ce644 /src/com/android | |
| parent | 3db43b7ae0678b81b3e7a33ee5f6c14f599837f1 (diff) | |
| download | CellBroadcastReceiver-86e0554982dd34959ade84b498b859622b055a72.tar.gz | |
Add metrics from CBR.
Test: manually verify using testdrive
Bug: 154555092
Change-Id: I868d3deb4c0d0c1e06afeaba92078ed801008917
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java | 14 | ||||
| -rw-r--r-- | src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java | 4 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java index 82a5fd1f5..6b46e9d8e 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java @@ -16,6 +16,9 @@ package com.android.cellbroadcastreceiver; +import static android.telephony.SmsCbMessage.MESSAGE_FORMAT_3GPP; +import static android.telephony.SmsCbMessage.MESSAGE_FORMAT_3GPP2; + import android.annotation.NonNull; import android.app.ActivityManager; import android.app.Notification; @@ -51,6 +54,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange; +import com.android.cellbroadcastservice.CellBroadcastStatsLog; import com.android.internal.annotations.VisibleForTesting; import java.util.ArrayList; @@ -272,6 +276,16 @@ public class CellBroadcastAlertService extends Service return; } + if (message.getMessageFormat() == MESSAGE_FORMAT_3GPP) { + CellBroadcastStatsLog.write(CellBroadcastStatsLog.CB_MESSAGE_REPORTED, + CellBroadcastStatsLog.CELL_BROADCAST_MESSAGE_REPORTED__TYPE__GSM, + CellBroadcastStatsLog.CELL_BROADCAST_MESSAGE_REPORTED__SOURCE__CB_RECEIVER_APP); + } else if (message.getMessageFormat() == MESSAGE_FORMAT_3GPP2) { + CellBroadcastStatsLog.write(CellBroadcastStatsLog.CB_MESSAGE_REPORTED, + CellBroadcastStatsLog.CELL_BROADCAST_MESSAGE_REPORTED__TYPE__CDMA, + CellBroadcastStatsLog.CELL_BROADCAST_MESSAGE_REPORTED__SOURCE__CB_RECEIVER_APP); + } + if (!shouldDisplayMessage(message)) { return; } diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java index fd0198ab8..faf622964 100644 --- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java +++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java @@ -41,6 +41,7 @@ import android.widget.Toast; import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import com.android.cellbroadcastservice.CellBroadcastStatsLog; import com.android.internal.annotations.VisibleForTesting; import java.util.ArrayList; @@ -121,6 +122,9 @@ public class CellBroadcastReceiver extends BroadcastReceiver { .equals(action)) { ArrayList<CdmaSmsCbProgramData> programDataList = intent.getParcelableArrayListExtra("program_data"); + CellBroadcastStatsLog.write(CellBroadcastStatsLog.CB_MESSAGE_REPORTED, + CellBroadcastStatsLog.CELL_BROADCAST_MESSAGE_REPORTED__TYPE__CDMA_SPC, + CellBroadcastStatsLog.CELL_BROADCAST_MESSAGE_REPORTED__SOURCE__CB_RECEIVER_APP); if (programDataList != null) { handleCdmaSmsCbProgramData(programDataList); } else { |