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

Commit b76b3923 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

Minor tweaks to UserspaceRebootLogger 

* Add method name to all Slog.wtf() calls
* Do not Slog.wtf in shouldLogUserspaceRebootEvent method
* Also added OWNERS for UserspaceRebootLogger.java

Test: device boots
Test: no UserspaceRebootLogger logs in logcat
Test: atest CtsUserspaceRebootHostSideTestCases
Change-Id: Ifc2a13957157838dade3701f0b35dad51d26ec45
parent 23b7c01b

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

+3 −0
Original line number Diff line number Diff line
@@ -7,3 +7,6 @@ per-file VibratorService.java, DisplayThread.java = ogunwale@google.com 


# 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;

        }