commit 0008986ef10585f7aeb70cda8e633b7fa7994e30
author Rubin Xu <rubinxu@google.com> Thu Nov 14 10:51:29 2019 +0000
committer Rubin Xu <rubinxu@google.com> Thu Nov 14 10:53:43 2019 +0000
tree b113df8f19c03458f397690b61f48805704b14b2
parent bfe25c3b29ca2dcea5f0da1c9971fb0d9711e055

Fix NPE in ChooseLockPattern

Since mChosenPattern can be null, guard against it.

Bug: 144452509
Test: manual
Change-Id: I2814e49ee2e63e19631e8415efcc50e9ae78d4fc

src/com/android/settings/password/ChooseLockPattern.java

diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index b81b0c4..b5670ca 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -30,7 +30,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
@@ -57,8 +56,6 @@
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -608,8 +605,10 @@
 
         public void handleLeftButton() {
             if (mUiStage.leftMode == LeftButtonMode.Retry) {
-                mChosenPattern.zeroize();
-                mChosenPattern = null;
+                if (mChosenPattern != null) {
+                    mChosenPattern.zeroize();
+                    mChosenPattern = null;
+                }
                 mLockPatternView.clearPattern();
                 updateStage(Stage.Introduction);
             } else {