Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04f255ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove obsolete comment about Weaver deadlock" into main am: 9d44241b am: aafaa51e 

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



Change-Id: I6e76a1d3e54518a78cc185724cd161f0aeaf6cfc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3621c70c aafaa51e

services/core/java/com/android/server/locksettings/LockSettingsService.java

+1 −3
Original line number Diff line number Diff line
@@ -1183,9 +1183,7 @@ public class LockSettingsService extends ILockSettings.Stub { 


            // If config_disableWeaverOnUnsecuredUsers=true, then the Weaver HAL may be buggy and

            // need multiple retries before it works here to unwrap the SP, if the SP was already

            // protected by Weaver.  Note that the problematic HAL can also deadlock if called with

            // the ActivityManagerService lock held, but that should not be a problem here since

            // that lock isn't held here, unlike unlockUserKeyIfUnsecured() where it is.

            // protected by Weaver.

            for (int i = 0; i < 12 && sp == null; i++) {

                Slog.e(TAG, "Failed to unwrap synthetic password. Waiting 5 seconds to retry.");

                SystemClock.sleep(5000);