Merge "Check for null before invoking finish()"

2019-02-14 04:58:05 +00:00
parent 3c991847aa ee922128e4
commit 178d79dd66
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -58,7 +58,9 @@ public class FaceSettings extends DashboardFragment {
    private FaceSettingsAttentionPreferenceController mAttentionController;

    private final FaceSettingsRemoveButtonPreferenceController.Listener mRemovalListener = () -> {
-        getActivity().finish();
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
    };

    public static boolean isAvailable(Context context) {