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

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

Merge "Log more info on StorageManagerService.unlockUserKey()" into rvc-dev am: 159904ef 

Change-Id: I60221329fc74ac7e2218cea18fd0c2b7ec1e9f4b
parents ba8151af 159904ef

services/core/java/com/android/server/StorageManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -3215,10 +3215,14 @@ class StorageManagerService extends IStorageManager.Stub 


    @Override

    public void unlockUserKey(int userId, int serialNumber, byte[] token, byte[] secret) {

        Slog.d(TAG, "unlockUserKey: " + userId);

        boolean isFsEncrypted = StorageManager.isFileEncryptedNativeOrEmulated();

        Slog.d(TAG, "unlockUserKey: " + userId

                + " isFileEncryptedNativeOrEmulated: " + isFsEncrypted

                + " hasToken: " + (token != null)

                + " hasSecret: " + (secret != null));

        enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);



        if (StorageManager.isFileEncryptedNativeOrEmulated()) {

        if (isFsEncrypted) {

            try {

                mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),

                        encodeBytes(secret));