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

Merge "Set a shorter timeout for logging a warn on slow IUserSwitchObservers." into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-18 18:08:42 +00:00
committed by Android (Google) Code Review
parent 2c4c1f1e6d eeb7039c23
commit 928add13d4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/UserController.java
View File

@@ -129,6 +129,10 @@ class UserController implements Handler.Callback {
// giving up on them and unfreezing the screen. // giving up on them and unfreezing the screen.
static final int USER_SWITCH_TIMEOUT_MS = 3 * 1000; static final int USER_SWITCH_TIMEOUT_MS = 3 * 1000;
// Amount of time we wait for observers to handle a user switch before we log a warning.
// Must be smaller than USER_SWITCH_TIMEOUT_MS.
private static final int USER_SWITCH_WARNING_TIMEOUT_MS = 500;
// ActivityManager thread message constants // ActivityManager thread message constants
static final int REPORT_USER_SWITCH_MSG = 10; static final int REPORT_USER_SWITCH_MSG = 10;
static final int CONTINUE_USER_SWITCH_MSG = 20; static final int CONTINUE_USER_SWITCH_MSG = 20;
@@ -1494,7 +1498,11 @@ class UserController implements Handler.Callback {
if (delay > USER_SWITCH_TIMEOUT_MS) { if (delay > USER_SWITCH_TIMEOUT_MS) {
Slog.e(TAG, "User switch timeout: observer " + name Slog.e(TAG, "User switch timeout: observer " + name
+ " sent result after " + delay + " ms"); + " sent result after " + delay + " ms");
} else if (delay > USER_SWITCH_WARNING_TIMEOUT_MS) {
Slog.w(TAG, "User switch slowed down by observer " + name
+ ": result sent after " + delay + " ms");
} }
curWaitingUserSwitchCallbacks.remove(name); curWaitingUserSwitchCallbacks.remove(name);
// Continue switching if all callbacks have been notified and // Continue switching if all callbacks have been notified and
// user switching session is still valid // user switching session is still valid