Merge "Add error id when build is debuggable." into sc-dev

2 files changed, 2 insertions, 12 deletions

diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java
index 0c0d70c449a9..431bf4c54b4b 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<OnPropertiesChangedListener, Pair<String, Executor>> sListeners =
diff --git a/services/core/java/com/android/server/am/TraceErrorLogger.java b/services/core/java/com/android/server/am/TraceErrorLogger.java
index 02e5f6dc5d8c..55f571560a5b 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;
  */
 public 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;
     }
 
     /**