From bf2043a138af1d4b262fac6ce1864f17055af2ae Mon Sep 17 00:00:00 2001 From: Corina Grigoras Date: Thu, 31 Dec 2020 11:17:15 +0000 Subject: 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 --- services/core/java/com/android/server/StorageManagerService.java | 3 +++ 1 file changed, 3 insertions(+) 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; -- cgit v1.2.3-59-g8ed1b