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

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

Merge "Make dumpsys display & power critical" into main

parents b819673d 136d7481

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

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import static android.hardware.display.DisplayViewport.VIEWPORT_EXTERNAL; 
import static android.hardware.display.DisplayViewport.VIEWPORT_INTERNAL;

import static android.hardware.display.DisplayViewport.VIEWPORT_VIRTUAL;

import static android.hardware.display.HdrConversionMode.HDR_CONVERSION_UNSUPPORTED;

import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;

import static android.os.Process.FIRST_APPLICATION_UID;

import static android.os.Process.ROOT_UID;
@@ -593,7 +594,7 @@ public final class DisplayManagerService extends SystemService { 
        DisplayManagerGlobal.invalidateLocalDisplayInfoCaches();



        publishBinderService(Context.DISPLAY_SERVICE, new BinderService(),

                true /*allowIsolated*/);

                true /*allowIsolated*/, DUMP_FLAG_PRIORITY_CRITICAL);

        publishLocalService(DisplayManagerInternal.class, new LocalService());

    }

services/core/java/com/android/server/power/PowerManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.power; 


import static android.hardware.display.DisplayManagerInternal.DisplayPowerRequest.policyToString;

import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;

import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_DEFAULT;

import static android.os.PowerManager.GO_TO_SLEEP_REASON_DISPLAY_GROUPS_TURNED_OFF;

import static android.os.PowerManager.GO_TO_SLEEP_REASON_DISPLAY_GROUP_REMOVED;

import static android.os.PowerManager.WAKE_REASON_DISPLAY_GROUP_ADDED;
@@ -1280,7 +1279,7 @@ public final class PowerManagerService extends SystemService 
    @Override

    public void onStart() {

        publishBinderService(Context.POWER_SERVICE, mBinderService, /* allowIsolated= */ false,

                DUMP_FLAG_PRIORITY_DEFAULT | DUMP_FLAG_PRIORITY_CRITICAL);

                DUMP_FLAG_PRIORITY_CRITICAL);

        publishLocalService(PowerManagerInternal.class, mLocalService);



        Watchdog.getInstance().addMonitor(this);