Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I60221329fc74ac7e2218cea18fd0c2b7ec1e9f4b
This commit is contained in:
TreeHugger Robot
2020-04-14 01:13:14 +00:00
committed by Automerger Merge Worker
parent ba8151af31 159904ef21
commit 4a927bf1ef
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -3215,10 +3215,14 @@ class StorageManagerService extends IStorageManager.Stub
@Override @Override
public void unlockUserKey(int userId, int serialNumber, byte[] token, byte[] secret) { 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); enforcePermission(android.Manifest.permission.STORAGE_INTERNAL);
if (StorageManager.isFileEncryptedNativeOrEmulated()) { if (isFsEncrypted) {
try { try {
mVold.unlockUserKey(userId, serialNumber, encodeBytes(token), mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),
encodeBytes(secret)); encodeBytes(secret));