commit 21d1502c8441cb56fbbfa63a7d70afe5c71ffbaa
author Corina Grigoras <corinac@google.com> Tue Jan 05 12:21:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 05 12:21:34 2021 +0000
tree 77ba530938c57aa592b3d620b75e971c246cce31
parent df076f3e1759d2af0c11d2ca25c478da41d27bba
parent e2a3315a12f7a68dd0cd95b68a6c2cf2f36b7b07

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

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

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index dd497a6..c8d457d 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3298,6 +3298,9 @@
             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;