summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Corina Grigoras <corinac@google.com> 2020-12-31 11:17:15 +0000
committer Corina Grigoras <corinac@google.com> 2021-01-05 11:09:10 +0000
commitbf2043a138af1d4b262fac6ce1864f17055af2ae (patch)
tree2b1a725df657264ec86e86c3956a0f6e060396ca
parent9f2c15890cb771bcb929ffd5a29a0333442517de (diff)
Log at debug level when things are OK
StorageManagerService: android.os.ServiceSpecificException is expected if the user has not unlocked the device. Bug: 151077642 Bug: 174442693 Change-Id: I07b06cd6f7cff4529cba46aa4e3dcf7b0ee8dfa5 Test: No Merged-In: I027250bcae132d9be9c16690478adb41467bfec4
-rw-r--r--services/core/java/com/android/server/StorageManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index dd497a656fae..c8d457d370ff 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3298,6 +3298,9 @@ class StorageManagerService extends IStorageManager.Stub
try {
mVold.unlockUserKey(userId, serialNumber, encodeBytes(token),
encodeBytes(secret));
+ } catch (ServiceSpecificException sse) {
+ Slog.d(TAG, "Expected if the user has not unlocked the device.", sse);
+ return;
} catch (Exception e) {
Slog.wtf(TAG, e);
return;