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

Commit 5728b473 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AnomalyReport catch any exception when try to read deviceConfig" into... 

Merge "AnomalyReport catch any exception when try to read deviceConfig" into tm-qpr-dev am: f60a9151 am: 292caba3

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



Change-Id: Idc1c0b1fc96a4ca3ea17e0a54b68bb427756818c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a112aaf 292caba3

telephony/java/android/telephony/AnomalyReporter.java

+12 −6
Original line number Diff line number Diff line
@@ -105,14 +105,20 @@ public final class AnomalyReporter { 
     * @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) {

            Rlog.w(TAG, "AnomalyReporter not yet initialized, dropping event=" + eventId);

            return;

        }



        // Don't report if the server-side flag isn't loaded, as it implies other anomaly report

        // related config hasn't loaded.

        try {

            boolean isAnomalyReportEnabledFromServer = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_TELEPHONY, KEY_IS_TELEPHONY_ANOMALY_REPORT_ENABLED, false);

                    DeviceConfig.NAMESPACE_TELEPHONY, KEY_IS_TELEPHONY_ANOMALY_REPORT_ENABLED,

                    false);

            if (!isAnomalyReportEnabledFromServer) return;



        if (sContext == null) {

            Rlog.w(TAG, "AnomalyReporter not yet initialized, dropping event=" + eventId);

        } catch (Exception e) {

            Rlog.w(TAG, "Unable to read device config, dropping event=" + eventId);

            return;

        }