PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in ChooseLockPattern"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-20 15:02:29 +00:00
committed by Android (Google) Code Review
parent 97f4158cc7 0008986ef1
commit 758aae48b0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -30,7 +30,6 @@ import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.TextView; import android.widget.TextView;
@@ -57,8 +56,6 @@ import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -608,8 +605,10 @@ public class ChooseLockPattern extends SettingsActivity {
public void handleLeftButton() { public void handleLeftButton() {
if (mUiStage.leftMode == LeftButtonMode.Retry) { if (mUiStage.leftMode == LeftButtonMode.Retry) {
mChosenPattern.zeroize(); if (mChosenPattern != null) {
mChosenPattern = null; mChosenPattern.zeroize();
mChosenPattern = null;
}
mLockPatternView.clearPattern(); mLockPatternView.clearPattern();
updateStage(Stage.Introduction); updateStage(Stage.Introduction);
} else { } else {