diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-10 18:11:07 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-08-12 18:12:58 -0700 |
| commit | f92fbc1c49ec09762a2ed81297002865638f37ae (patch) | |
| tree | 55371c9cf6097da95cc6e0e9f7a852ae877fa82a /src/com/android/settings/SettingsPreferenceFragment.java | |
| parent | 1d29bde1f5369b5cb5b24adbad662ef33524f4e2 (diff) | |
| download | packages_apps_Settings-f92fbc1c49ec09762a2ed81297002865638f37ae.zip packages_apps_Settings-f92fbc1c49ec09762a2ed81297002865638f37ae.tar.gz packages_apps_Settings-f92fbc1c49ec09762a2ed81297002865638f37ae.tar.bz2 | |
Wait with finishing until fingerprints are removed
Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
| -rw-r--r-- | src/com/android/settings/SettingsPreferenceFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 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, |