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

Commit 16836443 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update flag description for user_data_refactoring" into main

parents 3c8bc430 baaf3602

services/core/java/com/android/server/am/UserController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1613,7 +1613,7 @@ class UserController implements Handler.Callback { 
            } catch (RemoteException re) {

            } catch (RemoteException re) {

                throw re.rethrowAsRuntimeException();

                throw re.rethrowAsRuntimeException();

            }

            }

            if (com.android.server.flags.Flags.userDataRefactoring()) {

            if (com.android.server.flags.Flags.keystoreInMemoryCleanup()) {

                // Send communication to keystore to wipe key cache for the given userId.

                // Send communication to keystore to wipe key cache for the given userId.

                mInjector.getKeyStoreAuthorization().onUserStorageLocked(userId);

                mInjector.getKeyStoreAuthorization().onUserStorageLocked(userId);

            }

            }

services/core/java/com/android/server/flags/services.aconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -59,8 +59,8 @@ flag { 
}

}





flag {

flag {

    name: "user_data_refactoring"

    name: "keystore_in_memory_cleanup"

    namespace: "desktop_security"

    namespace: "desktop_security"

    description: "System services can use the SafePerUserDataCacheInterface and SafePerUserSystemService subclass for handling user data"

    description: "Keystore cleans up all components of the UserSuperKeys when the user credential encrypted storage is locked"

    bug: "384030190"

    bug: "384030190"

}
 
}