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

Commit 935eedff authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Enable Runtime logging in DisplayManager" into main

parents 247efa91 1763c5bf

core/java/android/hardware/display/DisplayManager.java

+6 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.os.Looper; 
import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.Log;

import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;
@@ -71,7 +72,11 @@ import java.util.function.Predicate; 
@SystemService(Context.DISPLAY_SERVICE)

public final class DisplayManager {

    private static final String TAG = "DisplayManager";

    private static final boolean DEBUG = false;



    // To enable these logs, run:

    // 'adb shell setprop persist.log.tag.DisplayManager DEBUG && adb reboot'

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

            || Log.isLoggable("DisplayManager_All", Log.DEBUG);

    private static final boolean ENABLE_VIRTUAL_DISPLAY_REFRESH_RATE = true;



    /**

core/java/android/hardware/display/DisplayManagerGlobal.java

+3 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ public final class DisplayManagerGlobal { 
    private static String sCurrentPackageName = ActivityThread.currentPackageName();

    private static boolean sExtraDisplayListenerLogging = initExtraLogging();



    private static final boolean DEBUG = false || sExtraDisplayListenerLogging;

    // To enable these logs, run:

    // 'adb shell setprop persist.log.tag.DisplayManager DEBUG && adb reboot'

    private static final boolean DEBUG = DisplayManager.DEBUG || sExtraDisplayListenerLogging;



    // True if display info and display ids should be cached.

    //

services/core/java/com/android/server/display/AmbientBrightnessStatsTracker.java

+5 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.FrameworkStatsLog;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.display.utils.DebugUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -50,7 +51,10 @@ import java.util.Map; 
public class AmbientBrightnessStatsTracker {



    private static final String TAG = "AmbientBrightnessStatsTracker";

    private static final boolean DEBUG = false;



    // To enable these logs, run:

    // 'adb shell setprop persist.log.tag.AmbientBrightnessStatsTracker DEBUG && adb reboot'

    private static final boolean DEBUG = DebugUtils.isDebuggable(TAG);



    @VisibleForTesting

    static final float[] BUCKET_BOUNDARIES_FOR_NEW_STATS =

services/core/java/com/android/server/display/BrightnessThrottler.java

+4 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData;

import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel;

import com.android.server.display.feature.DeviceConfigParameterProvider;

import com.android.server.display.utils.DebugUtils;

import com.android.server.display.utils.DeviceConfigParsingUtils;



import java.io.PrintWriter;
@@ -58,8 +59,10 @@ import java.util.function.Function; 
@Deprecated

class BrightnessThrottler {

    private static final String TAG = "BrightnessThrottler";

    private static final boolean DEBUG = false;



    // To enable these logs, run:

    // 'adb shell setprop persist.log.tag.BrightnessThrottler DEBUG && adb reboot'

    private static final boolean DEBUG = DebugUtils.isDebuggable(TAG);

    private static final int THROTTLING_INVALID = -1;



    private final Injector mInjector;

services/core/java/com/android/server/display/BrightnessTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import com.android.internal.util.RingBuffer; 
import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.LocalServices;

import com.android.server.display.utils.DebugUtils;



import libcore.io.IoUtils;
@@ -91,8 +92,10 @@ import java.util.concurrent.TimeUnit; 
public class BrightnessTracker {



    static final String TAG = "BrightnessTracker";

    static final boolean DEBUG = false;



    // To enable these logs, run:

    // 'adb shell setprop persist.log.tag.BrightnessTracker DEBUG && adb reboot'

    static final boolean DEBUG = DebugUtils.isDebuggable(TAG);

    private static final String EVENTS_FILE = "brightness_events.xml";

    private static final String AMBIENT_BRIGHTNESS_STATS_FILE = "ambient_brightness_stats.xml";

    private static final int MAX_EVENTS = 100;