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

Merge "Populate carrier id in anomaly reports." am: cf4cc8c1b9

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

Change-Id: I39cd16261249fe2ccaa4e3439d9b41080f22f637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kiwon Park
2022-05-10 20:59:48 +00:00
committed by Automerger Merge Worker
parent f3edf38753 cf4cc8c1b9
commit 68c6469e54
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
telephony/java/android/telephony/AnomalyReporter.java
View File

@@ -16,6 +16,8 @@
package android.telephony; package android.telephony;
import static android.telephony.TelephonyManager.UNKNOWN_CARRIER_ID;
import static com.android.internal.telephony.TelephonyStatsLog.TELEPHONY_ANOMALY_DETECTED; import static com.android.internal.telephony.TelephonyStatsLog.TELEPHONY_ANOMALY_DETECTED;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -73,6 +75,7 @@ public final class AnomalyReporter {
* *
* This method sends the {@link TelephonyManager#ACTION_ANOMALY_REPORTED} broadcast, which is * This method sends the {@link TelephonyManager#ACTION_ANOMALY_REPORTED} broadcast, which is
* system protected. Invoking this method unless you are the system will result in an error. * system protected. Invoking this method unless you are the system will result in an error.
* Carrier Id will be set as UNKNOWN_CARRIER_ID.
* *
* @param eventId a fixed event ID that will be sent for each instance of the same event. This * @param eventId a fixed event ID that will be sent for each instance of the same event. This
* ID should be generated randomly. * ID should be generated randomly.
@@ -81,6 +84,23 @@ public final class AnomalyReporter {
* static and must not contain any sensitive information (especially PII). * static and must not contain any sensitive information (especially PII).
*/ */
public static void reportAnomaly(@NonNull UUID eventId, String description) { public static void reportAnomaly(@NonNull UUID eventId, String description) {
reportAnomaly(eventId, description, UNKNOWN_CARRIER_ID);
}
/**
* If enabled, build and send an intent to a Debug Service for logging.
*
* This method sends the {@link TelephonyManager#ACTION_ANOMALY_REPORTED} broadcast, which is
* system protected. Invoking this method unless you are the system will result in an error.
*
* @param eventId a fixed event ID that will be sent for each instance of the same event. This
* ID should be generated randomly.
* @param description an optional description, that if included will be used as the subject for
* identification and discussion of this event. This description should ideally be
* static and must not contain any sensitive information (especially PII).
* @param carrierId the carrier of the id associated with this event.
*/
public static void reportAnomaly(@NonNull UUID eventId, String description, int carrierId) {
if (sContext == null) { if (sContext == null) {
Rlog.w(TAG, "AnomalyReporter not yet initialized, dropping event=" + eventId); Rlog.w(TAG, "AnomalyReporter not yet initialized, dropping event=" + eventId);
return; return;
@@ -88,7 +108,7 @@ public final class AnomalyReporter {
TelephonyStatsLog.write( TelephonyStatsLog.write(
TELEPHONY_ANOMALY_DETECTED, TELEPHONY_ANOMALY_DETECTED,
0, // TODO: carrier id needs to be populated carrierId,
eventId.getLeastSignificantBits(), eventId.getLeastSignificantBits(),
eventId.getMostSignificantBits()); eventId.getMostSignificantBits());