am 90ca1b67: am 0cae8ad7: am e9639b1d: am 5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev

* commit '90ca1b67cfa1507126c6b74b2de059d3bf579734': Wait with finishing until fingerprints are removed
2015-08-13 03:18:43 +00:00
parent ca9433519b 90ca1b67cf
commit c03459cd05
2 changed files with 17 additions and 7 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -511,7 +511,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,