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

Commit 0936166e authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge changes from topic "locksettings-aosp-first" into main am: 852ee8e4 

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



Change-Id: Ie6c324dabe2fbcf68cab035b318636bf8202621e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ec8af49 852ee8e4

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -1327,8 +1327,10 @@ public class SyntheticPasswordManager { 
            }

            }

            return result;

            return result;

        } else if (responseCode == GateKeeperResponse.RESPONSE_RETRY) {

        } else if (responseCode == GateKeeperResponse.RESPONSE_RETRY) {

            Slog.e(TAG, "Gatekeeper verification of synthetic password failed with RESPONSE_RETRY");

            return VerifyCredentialResponse.fromTimeout(response.getTimeout());

            return VerifyCredentialResponse.fromTimeout(response.getTimeout());

        } else {

        } else {

            Slog.e(TAG, "Gatekeeper verification of synthetic password failed with RESPONSE_ERROR");

            return VerifyCredentialResponse.ERROR;

            return VerifyCredentialResponse.ERROR;

        }

        }

    }

    }