Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor tweaks to UserspaceRebootLogger"

Browse Source
This commit is contained in:
Nikita Ioffe
2020-11-27 19:30:18 +00:00
committed by Gerrit Code Review
parent ebec38b952 b76b3923a1
commit 2e1432b902
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/OWNERS
View File

@@ -7,3 +7,6 @@ per-file VibratorService.java, DisplayThread.java = ogunwale@google.com
# Zram writeback # Zram writeback
per-file ZramWriteback.java = minchan@google.com, rajekumar@google.com, srnvs@google.com 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

10
services/core/java/com/android/server/UserspaceRebootLogger.java
View File

@@ -59,7 +59,7 @@ public final class UserspaceRebootLogger {
*/ */
public static void noteUserspaceRebootWasRequested() { public static void noteUserspaceRebootWasRequested() {
if (!PowerManager.isRebootingUserspaceSupportedImpl()) { if (!PowerManager.isRebootingUserspaceSupportedImpl()) {
Slog.wtf(TAG, "Userspace reboot is not supported."); Slog.wtf(TAG, "noteUserspaceRebootWasRequested: Userspace reboot is not supported.");
return; return;
} }
@@ -77,7 +77,7 @@ public final class UserspaceRebootLogger {
*/ */
public static void noteUserspaceRebootSuccess() { public static void noteUserspaceRebootSuccess() {
if (!PowerManager.isRebootingUserspaceSupportedImpl()) { if (!PowerManager.isRebootingUserspaceSupportedImpl()) {
Slog.wtf(TAG, "Userspace reboot is not supported."); Slog.wtf(TAG, "noteUserspaceRebootSuccess: Userspace reboot is not supported.");
return; return;
} }
@@ -88,11 +88,11 @@ public final class UserspaceRebootLogger {
/** /**
* Returns {@code true} if {@code UserspaceRebootReported} atom should be logged. * 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() { public static boolean shouldLogUserspaceRebootEvent() {
if (!PowerManager.isRebootingUserspaceSupportedImpl()) { if (!PowerManager.isRebootingUserspaceSupportedImpl()) {
Slog.wtf(TAG, "Userspace reboot is not supported.");
return false; return false;
} }
@@ -110,7 +110,7 @@ public final class UserspaceRebootLogger {
*/ */
public static void logEventAsync(boolean userUnlocked, Executor executor) { public static void logEventAsync(boolean userUnlocked, Executor executor) {
if (!PowerManager.isRebootingUserspaceSupportedImpl()) { if (!PowerManager.isRebootingUserspaceSupportedImpl()) {
Slog.wtf(TAG, "Userspace reboot is not supported."); Slog.wtf(TAG, "logEventAsync: Userspace reboot is not supported.");
return; return;
} }