Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf06d118 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear WIFI namspace on primary user keystore reset." am: 769fc70b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1723393

Change-Id: Ib3f8cb2bf5006e79f31780db106645624c875527
parents 08cfc3c3 769fc70b

services/core/java/com/android/server/locksettings/LockSettingsService.java

+8 −3
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ import android.security.keystore2.AndroidKeyStoreLoadStoreParameter; 
import android.security.keystore2.AndroidKeyStoreProvider;

import android.service.gatekeeper.GateKeeperResponse;

import android.service.gatekeeper.IGateKeeperService;

import android.system.keystore2.Domain;

import android.text.TextUtils;

import android.util.ArrayMap;

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.

     */

    private static final int[] SYSTEM_CREDENTIAL_UIDS = {

            Process.WIFI_UID, Process.VPN_UID,

            Process.ROOT_UID, Process.SYSTEM_UID };

            Process.VPN_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
@@ -1987,9 +1987,14 @@ public class LockSettingsService extends ILockSettings.Stub { 
            // Clear all the users credentials could have been installed in for this user.

            for (int profileId : mUserManager.getProfileIdsWithDisabled(userId)) {

                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 {

            if (managedUserId != -1 && managedUserDecryptedPassword != null) {

                if (DEBUG) Slog.v(TAG, "Restore tied profile lock");