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

Commit 551b6f0b authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Minor tweaks to UserspaceRebootLogger" am: 2e1432b9 am: feeb1658 am: fce76413 

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

Change-Id: Ie40c31fbee9e29c9c00756fb8659ead588180d3f
parents 4d1cc9ca fce76413

services/core/java/com/android/server/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -6,3 +6,6 @@ per-file VibratorManagerService.java, VibratorService.java, DisplayThread.java = 


# Zram writeback

per-file ZramWriteback.java = minchan@google.com, rajekumar@google.com, srnvs@google.com



# Userspace reboot

per-file UserspaceRebootLogger.java = ioffe@google.com, tomcherry@google.com

services/core/java/com/android/server/UserspaceRebootLogger.java

+5 −5
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public final class UserspaceRebootLogger { 
     */

    public static void noteUserspaceRebootWasRequested() {

        if (!PowerManager.isRebootingUserspaceSupportedImpl()) {

            Slog.wtf(TAG, "Userspace reboot is not supported.");

            Slog.wtf(TAG, "noteUserspaceRebootWasRequested: Userspace reboot is not supported.");

            return;

        }
@@ -77,7 +77,7 @@ public final class UserspaceRebootLogger { 
     */

    public static void noteUserspaceRebootSuccess() {

        if (!PowerManager.isRebootingUserspaceSupportedImpl()) {

            Slog.wtf(TAG, "Userspace reboot is not supported.");

            Slog.wtf(TAG, "noteUserspaceRebootSuccess: Userspace reboot is not supported.");

            return;

        }
@@ -88,11 +88,11 @@ public final class UserspaceRebootLogger { 
    /**

     * Returns {@code true} if {@code UserspaceRebootReported} atom should be logged.

     *

     * <p>This call should only be made on devices supporting userspace reboot.

     * <p>On devices that do not support userspace reboot this method will always return {@code

     * false}.

     */

    public static boolean shouldLogUserspaceRebootEvent() {

        if (!PowerManager.isRebootingUserspaceSupportedImpl()) {

            Slog.wtf(TAG, "Userspace reboot is not supported.");

            return false;

        }
@@ -110,7 +110,7 @@ public final class UserspaceRebootLogger { 
     */

    public static void logEventAsync(boolean userUnlocked, Executor executor) {

        if (!PowerManager.isRebootingUserspaceSupportedImpl()) {

            Slog.wtf(TAG, "Userspace reboot is not supported.");

            Slog.wtf(TAG, "logEventAsync: Userspace reboot is not supported.");

            return;

        }