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

Commit b63615d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear WIFI namspace on primary user keystore reset." into sc-dev am: b84e5cda 

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

Change-Id: Iada3031e8693584f615ad108ac9e4d6edf981229
parents 06705c0d b84e5cda

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;
@@ -254,8 +255,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
@@ -2123,9 +2123,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");