From 30e9fc870fae222e00239bd42c7c14f0fd40c7c2 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Wed, 10 Feb 2016 12:55:37 -0500
Subject: [PATCH] Fix activity weirdness by doing the right thing

Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
---
 src/com/android/settings/SettingsPreferenceFragment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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