commit f92fbc1c49ec09762a2ed81297002865638f37ae
author Jorim Jaggi <jjaggi@google.com> Mon Aug 10 18:11:07 2015 -0700
committer Jorim Jaggi <jjaggi@google.com> Wed Aug 12 18:12:58 2015 -0700
tree 55371c9cf6097da95cc6e0e9f7a852ae877fa82a
parent 1d29bde1f5369b5cb5b24adbad662ef33524f4e2

Wait with finishing until fingerprints are removed

Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index baf04d4..b957c38 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -505,7 +505,10 @@
     }
 
     public void finish() {
-        getActivity().onBackPressed();
+        Activity activity = getActivity();
+        if (activity != null) {
+            activity.onBackPressed();
+        }
     }
 
     public boolean startFragment(Fragment caller, String fragmentClass, int titleRes,