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

Commit 7b66fe70 authored by Donghyun Cho's avatar Donghyun Cho Committed by android-build-merger
Browse files

Merge "Turn on HDMI-related logs conditionally for better debugging" into nyc-dev am: 5ee693f4 

am: be8e7f9f

* commit 'be8e7f9f':
  Turn on HDMI-related logs conditionally for better debugging

Change-Id: I70400a1db130dd2f5d20b41cda9386c5cac87866
parents ef971544 be8e7f9f

services/core/java/com/android/server/hdmi/HdmiLogger.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Build; 
import android.os.SystemClock;

import android.os.SystemClock;

import android.util.Pair;

import android.util.Pair;

import android.util.Slog;

import android.util.Slog;

import android.util.Log;





import java.util.HashMap;

import java.util.HashMap;
@@ -42,6 +43,7 @@ final class HdmiLogger { 
    // Logging duration for same error message.

    // Logging duration for same error message.

    private static final long ERROR_LOG_DURATTION_MILLIS = 20 * 1000;  // 20s

    private static final long ERROR_LOG_DURATTION_MILLIS = 20 * 1000;  // 20s





    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final boolean IS_USER_BUILD = "user".equals(Build.TYPE);

    private static final boolean IS_USER_BUILD = "user".equals(Build.TYPE);





    private static final ThreadLocal<HdmiLogger> sLogger = new ThreadLocal<>();

    private static final ThreadLocal<HdmiLogger> sLogger = new ThreadLocal<>();
@@ -83,11 +85,10 @@ final class HdmiLogger { 
    }

    }





    private void debugInternal(String logMessage) {

    private void debugInternal(String logMessage) {

        if (true || IS_USER_BUILD) {

        if (DEBUG) {

            return;

        }

            Slog.d(TAG, logMessage);

            Slog.d(TAG, logMessage);

        }

        }

    }





    private static final String toLogString(String logMessage, Object[] objs) {

    private static final String toLogString(String logMessage, Object[] objs) {

        if (objs.length > 0) {

        if (objs.length > 0) {