From 1cf91a094f8b719fc1ab20a7a6861278633cdf28 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Wed, 26 Apr 2017 19:44:16 +0100 Subject: [PATCH] Restore resetKeyStore() logic of clearing SYSTEM uid Keystore no longer clears keys critical to device encryption flow so no need to skip clearing SYSTEM's keystore entries here. Bug: 34600579 Test: Add device lock under synthtic password, goto Settings/security/encryption, tap clear credentials and verify device lock is still intact. Change-Id: I191a545181771693fd2d75f1c23d14a6b74278af Merged-In: I191a545181771693fd2d75f1c23d14a6b74278af --- services/core/java/com/android/server/LockSettingsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index a184d70e39d8e..b54d6c1080878 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -160,7 +160,7 @@ public class LockSettingsService extends ILockSettings.Stub { */ private static final int[] SYSTEM_CREDENTIAL_UIDS = { Process.WIFI_UID, Process.VPN_UID, - Process.ROOT_UID }; + Process.ROOT_UID, Process.SYSTEM_UID }; // This class manages life cycle events for encrypted users on File Based Encryption (FBE) // devices. The most basic of these is to show/hide notifications about missing features until