Merge "Set a shorter timeout for logging a warn on slow IUserSwitchObservers." into qt-qpr1-dev (928add13) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/UserController.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -129,6 +129,10 @@ class UserController implements Handler.Callback {
		// giving up on them and unfreezing the screen.
		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
		static final int REPORT_USER_SWITCH_MSG = 10;
		static final int CONTINUE_USER_SWITCH_MSG = 20;
		@@ -1494,7 +1498,11 @@ class UserController implements Handler.Callback {
		if (delay > USER_SWITCH_TIMEOUT_MS) {
		Slog.e(TAG, "User switch timeout: observer " + name
		+ " 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);
		// Continue switching if all callbacks have been notified and
		// user switching session is still valid