From b76b3923a1d1c1371bf99912f5c0dbc185296dbc Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Fri, 27 Nov 2020 17:03:31 +0000 Subject: 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 --- services/core/java/com/android/server/OWNERS | 3 +++ .../core/java/com/android/server/UserspaceRebootLogger.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index 8099f8f37bc7..3d1e709ab3bd 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -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 diff --git a/services/core/java/com/android/server/UserspaceRebootLogger.java b/services/core/java/com/android/server/UserspaceRebootLogger.java index 2403b637581f..89327b50883c 100644 --- a/services/core/java/com/android/server/UserspaceRebootLogger.java +++ b/services/core/java/com/android/server/UserspaceRebootLogger.java @@ -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. * - *

This call should only be made on devices supporting userspace reboot. + *

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; } -- cgit v1.2.3-59-g8ed1b