Merge "Add debug logs for private space auto-lock" into main (53c403b8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -600,8 +600,11 @@ public class UserManagerService extends IUserManager.Stub {
		public void onReceive(Context context, Intent intent) {
		if (isAutoLockForPrivateSpaceEnabled()) {
		if (ACTION_SCREEN_OFF.equals(intent.getAction())) {
		Slog.d(LOG_TAG, "SCREEN_OFF broadcast received");
		maybeScheduleMessageToAutoLockPrivateSpace();
		} else if (ACTION_SCREEN_ON.equals(intent.getAction())) {
		Slog.d(LOG_TAG, "SCREEN_ON broadcast received, "
		+ "removing queued message to auto-lock private space");
		// Remove any queued messages since the device is interactive again
		mHandler.removeCallbacksAndMessages(PRIVATE_SPACE_AUTO_LOCK_MESSAGE_TOKEN);
		}
		@@ -619,6 +622,8 @@ public class UserManagerService extends IUserManager.Stub {
		getMainUserIdUnchecked());
		if (privateSpaceAutoLockPreference
		!= Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY) {
		Slogf.d(LOG_TAG, "Not scheduling auto-lock on inactivity,"
		+ "preference is set to %d", privateSpaceAutoLockPreference);
		return;
		}
		int privateProfileUserId = getPrivateProfileUserId();
		@@ -632,6 +637,7 @@ public class UserManagerService extends IUserManager.Stub {
		@VisibleForTesting
		void scheduleMessageToAutoLockPrivateSpace(int userId, Object token,
		long delayInMillis) {
		Slog.i(LOG_TAG, "Scheduling auto-lock message");
		mHandler.postDelayed(() -> {
		final PowerManager powerManager = mContext.getSystemService(PowerManager.class);
		if (powerManager != null && !powerManager.isInteractive()) {