Merge "Log at debug level when things are OK" am: d09e92e5d2 am: e2a3315a12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f158ad9304559fb7c004aa11ff49ecf04c4a3c8

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;