am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev

* commit '2dafe6664a7dd6d9aa227b0779a90891c2b1b2ef':
  CEC: Enable log for non-user builds

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

@@ -17,6 +17,7 @@
 package com.android.server.hdmi;
 
 import android.annotation.Nullable;
+import android.os.Build;
 import android.os.SystemClock;
 import android.util.Pair;
 import android.util.Slog;
@@ -41,7 +42,7 @@ final class HdmiLogger {
     // Logging duration for same error message.
     private static final long ERROR_LOG_DURATTION_MILLIS = 20 * 1000;  // 20s
 
-    private static final boolean DEBUG = false;
+    private static final boolean IS_USER_BUILD = "user".equals(Build.TYPE);
 
     private static final ThreadLocal<HdmiLogger> sLogger = new ThreadLocal<>();
 
@@ -82,7 +83,7 @@ final class HdmiLogger {
     }
 
     private void debugInternal(String logMessage) {
-        if (!DEBUG) {
+        if (IS_USER_BUILD) {
             return;
         }
         Slog.d(TAG, logMessage);