diff options
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index b0a586d122ea..14fe0c5e3c22 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -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)); |