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

Merge "Clear WIFI namspace on primary user keystore reset."

Browse Source
This commit is contained in:
Treehugger Robot
2021-06-01 22:46:45 +00:00
committed by Gerrit Code Review
parent f7c0f3c698 008502bf74
commit 769fc70ba0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,7 @@ import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
import android.security.keystore2.AndroidKeyStoreProvider; import android.security.keystore2.AndroidKeyStoreProvider;
import android.service.gatekeeper.GateKeeperResponse; import android.service.gatekeeper.GateKeeperResponse;
import android.service.gatekeeper.IGateKeeperService; import android.service.gatekeeper.IGateKeeperService;
import android.system.keystore2.Domain;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
@@ -253,8 +254,7 @@ public class LockSettingsService extends ILockSettings.Stub {
* The UIDs that are used for system credential storage in keystore. * The UIDs that are used for system credential storage in keystore.
*/ */
private static final int[] SYSTEM_CREDENTIAL_UIDS = { private static final int[] SYSTEM_CREDENTIAL_UIDS = {
Process.WIFI_UID, Process.VPN_UID, Process.VPN_UID, Process.ROOT_UID, Process.SYSTEM_UID};
Process.ROOT_UID, Process.SYSTEM_UID };
// This class manages life cycle events for encrypted users on File Based Encryption (FBE) // 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 // devices. The most basic of these is to show/hide notifications about missing features until
@@ -1987,9 +1987,14 @@ public class LockSettingsService extends ILockSettings.Stub {
// Clear all the users credentials could have been installed in for this user. // Clear all the users credentials could have been installed in for this user.
for (int profileId : mUserManager.getProfileIdsWithDisabled(userId)) { for (int profileId : mUserManager.getProfileIdsWithDisabled(userId)) {
for (int uid : SYSTEM_CREDENTIAL_UIDS) { for (int uid : SYSTEM_CREDENTIAL_UIDS) {
mKeyStore.clearUid(UserHandle.getUid(profileId, uid)); AndroidKeyStoreMaintenance.clearNamespace(Domain.APP,
UserHandle.getUid(profileId, uid));
} }
} }
if (mUserManager.getUserInfo(userId).isPrimary()) {
AndroidKeyStoreMaintenance.clearNamespace(Domain.SELINUX,
KeyProperties.NAMESPACE_WIFI);
}
} finally { } finally {
if (managedUserId != -1 && managedUserDecryptedPassword != null) { if (managedUserId != -1 && managedUserDecryptedPassword != null) {
if (DEBUG) Slog.v(TAG, "Restore tied profile lock"); if (DEBUG) Slog.v(TAG, "Restore tied profile lock");