commit 178d79dd662a96fafb80636b0ad67d227bed1e5c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 14 04:58:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 14 04:58:05 2019 +0000
tree d701b2bb05ac0b06054f1e6efc06c05817dfcebc
parent 3c991847aadb1a708a413676abcc5e363fbe314e
parent ee922128e4dc17a52e4b8356d94cd1d43ce6f678

Merge "Check for null before invoking finish()"

src/com/android/settings/biometrics/face/FaceSettings.java

diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 4e2c711..490580d 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -58,7 +58,9 @@
     private FaceSettingsAttentionPreferenceController mAttentionController;
 
     private final FaceSettingsRemoveButtonPreferenceController.Listener mRemovalListener = () -> {
-        getActivity().finish();
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
     };
 
     public static boolean isAvailable(Context context) {