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

Commit f61b5365 authored by Yandry Perez Clemente's avatar Yandry Perez Clemente Committed by Automerger Merge Worker
Browse files

Merge "Add error id when build is debuggable." into sc-dev am: 0f7f3f23 am: c45736f3 

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

Change-Id: I6edc0f3191500453f5fdc879bb79ee493d4d54b9
parents 9b5d723f c45736f3

core/java/android/provider/DeviceConfig.java

+0 −7
Original line number Diff line number Diff line
@@ -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 =

services/core/java/com/android/server/am/TraceErrorLogger.java

+2 −5
Original line number Diff line number Diff line
@@ -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;

    }



    /**