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

Commit c4153730 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove obsolete comment about Weaver deadlock 

The explanation of why the deadlock should not occur turned out be
incorrect.  Therefore the deadlock had to be fixed, and this was done by
https://r.android.com/3291561.  Remove the obsolete part of the comment.

Change-Id: I08b29d5783ac75d6ac9c135d62f7d50c6e27c855
parent 7d00da34

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);