From a253a2b8a874943785bfe3e25eec5c79efab622c Mon Sep 17 00:00:00 2001 From: Yandry Perez Clemente Date: Tue, 25 May 2021 11:53:20 +0100 Subject: [PATCH] Add error id when build is debuggable. Bug: b/188122403 Test: Manual. Triggered an ANR and verified the error id is present in the ANR dropbox entry. Change-Id: Id6ac956ca5fe635189d12a9e2c0ba14e26e8719d --- core/java/android/provider/DeviceConfig.java | 7 ------- .../core/java/com/android/server/am/TraceErrorLogger.java | 7 ++----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 0c0d70c449a97..431bf4c54b4b6 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -597,13 +597,6 @@ public final class DeviceConfig { @TestApi public static final String NAMESPACE_CONSTRAIN_DISPLAY_APIS = "constrain_display_apis"; - /** - * Trace error logger properties definitions. - * - * @hide - */ - public static final String NAMESPACE_TRACE_ERROR_LOGGER = "trace_error_logger"; - private static final Object sLock = new Object(); @GuardedBy("sLock") private static ArrayMap> sListeners = diff --git a/services/core/java/com/android/server/am/TraceErrorLogger.java b/services/core/java/com/android/server/am/TraceErrorLogger.java index f055be2357169..190669dbcd923 100644 --- a/services/core/java/com/android/server/am/TraceErrorLogger.java +++ b/services/core/java/com/android/server/am/TraceErrorLogger.java @@ -16,8 +16,8 @@ package com.android.server.am; +import android.os.Build; import android.os.Trace; -import android.provider.DeviceConfig; import java.util.UUID; @@ -28,13 +28,10 @@ import java.util.UUID; */ class TraceErrorLogger { private static final String COUNTER_PREFIX = "ErrorId:"; - private static final String ADD_ERROR_ID = "add_error_id"; private static final int PLACEHOLDER_VALUE = 1; public boolean isAddErrorIdEnabled() { - return DeviceConfig - .getBoolean(DeviceConfig.NAMESPACE_TRACE_ERROR_LOGGER, ADD_ERROR_ID, - false); + return Build.IS_DEBUGGABLE; } /**