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

Commit ea73986e authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Use isCeStorageUnlocked() in AppDataRollbackHelper" into main am:... 

Merge "Use isCeStorageUnlocked() in AppDataRollbackHelper" into main am: e1b02f17 am: 51455685 am: 1dcb7ba7

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



Change-Id: If48b76b1c3dd97f857e18ef66eaf6fd2573fd906
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1795d44 1dcb7ba7

services/core/java/com/android/server/rollback/AppDataRollbackHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -266,10 +266,10 @@ public class AppDataRollbackHelper { 
    }



    /**

     * @return {@code true} iff. {@code userId} is locked on an FBE device.

     * @return {@code true} iff the credential-encrypted storage for {@code userId} is locked.

     */

    @VisibleForTesting

    public boolean isUserCredentialLocked(int userId) {

        return StorageManager.isFileEncrypted() && !StorageManager.isUserKeyUnlocked(userId);

        return StorageManager.isFileEncrypted() && !StorageManager.isCeStorageUnlocked(userId);

    }

}