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

Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-03 11:24:54 +00:00
committed by Android (Google) Code Review
parent c5cd3bcbc1 26a90c2b82
commit d48073491f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/LockTaskController.java
View File

@@ -472,7 +472,7 @@ public class LockTaskController {
setStatusBarState(LOCK_TASK_MODE_NONE, userId); setStatusBarState(LOCK_TASK_MODE_NONE, userId);
setKeyguardState(LOCK_TASK_MODE_NONE, userId); setKeyguardState(LOCK_TASK_MODE_NONE, userId);
if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) { if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) {
lockKeyguardIfNeeded(); lockKeyguardIfNeeded(userId);
} }
if (getDevicePolicyManager() != null) { if (getDevicePolicyManager() != null) {
getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId); getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId);
@@ -776,15 +776,15 @@ public class LockTaskController {
* Helper method for locking the device immediately. This may be necessary when the device * Helper method for locking the device immediately. This may be necessary when the device
* leaves the pinned mode. * leaves the pinned mode.
*/ */
private void lockKeyguardIfNeeded() { private void lockKeyguardIfNeeded(int userId) {
if (shouldLockKeyguard()) { if (shouldLockKeyguard(userId)) {
mWindowManager.lockNow(null); mWindowManager.lockNow(null);
mWindowManager.dismissKeyguard(null /* callback */, null /* message */); mWindowManager.dismissKeyguard(null /* callback */, null /* message */);
getLockPatternUtils().requireCredentialEntry(USER_ALL); getLockPatternUtils().requireCredentialEntry(USER_ALL);
} }
} }
private boolean shouldLockKeyguard() { private boolean shouldLockKeyguard(int userId) {
// This functionality should be kept consistent with // This functionality should be kept consistent with
// com.android.settings.security.ScreenPinningSettings (see b/127605586) // com.android.settings.security.ScreenPinningSettings (see b/127605586)
try { try {
@@ -794,7 +794,7 @@ public class LockTaskController {
} catch (Settings.SettingNotFoundException e) { } catch (Settings.SettingNotFoundException e) {
// Log to SafetyNet for b/127605586 // Log to SafetyNet for b/127605586
android.util.EventLog.writeEvent(0x534e4554, "127605586", -1, ""); android.util.EventLog.writeEvent(0x534e4554, "127605586", -1, "");
return getLockPatternUtils().isSecure(USER_CURRENT); return getLockPatternUtils().isSecure(userId);
} }
} }

2
services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java
View File

@@ -428,7 +428,7 @@ public class LockTaskControllerTest {
Settings.Secure.clearProviderForTest(); Settings.Secure.clearProviderForTest();
// AND a password is set // AND a password is set
when(mLockPatternUtils.isSecure(anyInt())) when(mLockPatternUtils.isSecure(TEST_USER_ID))
.thenReturn(true); .thenReturn(true);
// AND there is a task record // AND there is a task record