commit 30e9fc870fae222e00239bd42c7c14f0fd40c7c2
author Jason Monk <jmonk@google.com> Wed Feb 10 12:55:37 2016 -0500
committer Jason Monk <jmonk@google.com> Wed Feb 10 12:55:37 2016 -0500
tree 049e0a6cd240714f35a4dc614855a6e0ee5015b1
parent d119f50314c4923529a11dade3248005c26b4cfd

Fix activity weirdness by doing the right thing

Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 55f8be3..74941d6 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -625,8 +625,8 @@
 
     public void finish() {
         Activity activity = getActivity();
-        if (activity != null) {
-            activity.onBackPressed();
+        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
+            finish();
         }
     }