From 18dcd47796c4e6b5b3c31ea44abfb041a61857fc Mon Sep 17 00:00:00 2001 From: Vishwath Mohan Date: Thu, 29 Mar 2018 17:56:33 +0000 Subject: [PATCH] Don't clear mPattern when clearing visual pattern. This CL ensures that when clearing the lockscreen pattern in onHandleUp(), we retain mPattern. This fixes a bug that prevents changing from Pattern to other modalities. Bug: 77257848 Test: Change from pattern to pin/password Change-Id: Ied74eafd17939214c62bdd617ecef7a9974f755d --- core/java/com/android/internal/widget/LockPatternView.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 51dd92961f54a..e8fc5989354a6 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -1000,6 +1000,11 @@ public class LockPatternView extends View { setPatternInProgress(false); cancelLineAnimations(); notifyPatternDetected(); + // Also clear pattern if fading is enabled + if (mFadePattern) { + clearPatternDrawLookup(); + mPatternDisplayMode = DisplayMode.Correct; + } invalidate(); } if (PROFILE_DRAWING) {