Wait with finishing until fingerprints are removed

Bug: 22863210 Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
2015-08-10 18:11:07 -07:00
parent 1d29bde1f5
commit f92fbc1c49
2 changed files with 17 additions and 7 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -505,7 +505,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
    }

    public void finish() {
-        getActivity().onBackPressed();
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.onBackPressed();
+        }
    }

    public boolean startFragment(Fragment caller, String fragmentClass, int titleRes,