Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 348bdc23 authored by Kiwon Park's avatar Kiwon Park Committed by Automerger Merge Worker
Browse files

Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev... 

Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev am: c49ba33a am: cb63a3e6

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



Change-Id: I10b72e6e087c7a471484cbbca3d4085b1c990695
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 926b99f6 cb63a3e6

telephony/java/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@ filegroup { 
    srcs: [

        "**/*.java",

        "**/*.aidl",

        ":statslog-telephony-java-gen",

    ],

    visibility: ["//frameworks/base"],

}



genrule {

    name: "statslog-telephony-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module telephony" +

        " --javaPackage com.android.internal.telephony --javaClass TelephonyStatsLog",

    out: ["com/android/internal/telephony/TelephonyStatsLog.java"],

}

telephony/java/android/telephony/AnomalyReporter.java

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.telephony;



import static com.android.internal.telephony.TelephonyStatsLog.TELEPHONY_ANOMALY_DETECTED;



import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.content.Context;
@@ -24,6 +26,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.os.ParcelUuid;



import com.android.internal.telephony.TelephonyStatsLog;

import com.android.internal.util.IndentingPrintWriter;

import com.android.telephony.Rlog;
@@ -83,6 +86,12 @@ public final class AnomalyReporter { 
            return;

        }



        TelephonyStatsLog.write(

                TELEPHONY_ANOMALY_DETECTED,

                0, // TODO: carrier id needs to be populated

                eventId.getLeastSignificantBits(),

                eventId.getMostSignificantBits());



        // If this event has already occurred, skip sending intents for it; regardless log its

        // invocation here.

        Integer count = sEvents.containsKey(eventId) ? sEvents.get(eventId) + 1 : 1;