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

Merge "Require strong auth after user is stopped" into pi-dev

Browse Source 
am: 7109908a4e

Change-Id: I1386435d0e51e5c8381794d3e7fd325e69c042f0
This commit is contained in:
Rubin Xu
2018-03-27 10:46:25 +00:00
committed by android-build-merger
parent 349c220ee8 7109908a4e
commit 33a0fe9daa
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/locksettings/LockSettingsService.java
View File

@@ -21,6 +21,7 @@ import static android.Manifest.permission.READ_CONTACTS;
import static android.content.Context.KEYGUARD_SERVICE; import static android.content.Context.KEYGUARD_SERVICE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT;
import static com.android.internal.widget.LockPatternUtils.SYNTHETIC_PASSWORD_ENABLED_KEY; import static com.android.internal.widget.LockPatternUtils.SYNTHETIC_PASSWORD_ENABLED_KEY;
import static com.android.internal.widget.LockPatternUtils.SYNTHETIC_PASSWORD_HANDLE_KEY; import static com.android.internal.widget.LockPatternUtils.SYNTHETIC_PASSWORD_HANDLE_KEY;
@@ -524,6 +525,10 @@ public class LockSettingsService extends ILockSettings.Stub {
public void onCleanupUser(int userId) { public void onCleanupUser(int userId) {
hideEncryptionNotification(new UserHandle(userId)); hideEncryptionNotification(new UserHandle(userId));
// User is stopped with its CE key evicted. Require strong auth next time to be able to
// unlock the user's storage. Use STRONG_AUTH_REQUIRED_AFTER_BOOT since stopping and
// restarting a user later is equivalent to rebooting the device.
requireStrongAuth(STRONG_AUTH_REQUIRED_AFTER_BOOT, userId);
} }
public void onStartUser(final int userId) { public void onStartUser(final int userId) {