Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev (91ceae3e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/LockTaskController.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -512,7 +512,7 @@ public class LockTaskController {
		setStatusBarState(mLockTaskModeState, userId);
		setKeyguardState(mLockTaskModeState, userId);
		if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {
		lockKeyguardIfNeeded();
		lockKeyguardIfNeeded(userId);
		}
		if (getDevicePolicyManager() != null) {
		getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId);
		@@ -824,15 +824,15 @@ public class LockTaskController {
		* Helper method for locking the device immediately. This may be necessary when the device
		* leaves the pinned mode.
		*/
		private void lockKeyguardIfNeeded() {
		if (shouldLockKeyguard()) {
		private void lockKeyguardIfNeeded(int userId) {
		if (shouldLockKeyguard(userId)) {
		mWindowManager.lockNow(null);
		mWindowManager.dismissKeyguard(null /* callback /, null / message */);
		getLockPatternUtils().requireCredentialEntry(USER_ALL);
		}
		}

		private boolean shouldLockKeyguard() {
		private boolean shouldLockKeyguard(int userId) {
		// This functionality should be kept consistent with
		// com.android.settings.security.ScreenPinningSettings (see b/127605586)
		try {
		@@ -842,7 +842,7 @@ public class LockTaskController {
		} catch (Settings.SettingNotFoundException e) {
		// Log to SafetyNet for b/127605586
		android.util.EventLog.writeEvent(0x534e4554, "127605586", -1, "");
		return getLockPatternUtils().isSecure(USER_CURRENT);
		return getLockPatternUtils().isSecure(userId);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -450,7 +450,7 @@ public class LockTaskControllerTest {
		Settings.Secure.clearProviderForTest();

		// AND a password is set
		when(mLockPatternUtils.isSecure(anyInt()))
		when(mLockPatternUtils.isSecure(TEST_USER_ID))
		.thenReturn(true);

		// AND there is a task record