From 656bc6004f7e7358832026c4196d02e50752ca7f Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 10 Jun 2016 09:49:12 -0400
Subject: [PATCH] Fix crash in finish from onCreate.

Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324
---
 src/com/android/settings/SettingsPreferenceFragment.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index f5d7d869049..4796a9e9979 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -690,7 +690,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
 
     public void finish() {
         Activity activity = getActivity();
-        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
+        if (activity == null) return;
+        if (getFragmentManager().getBackStackEntryCount() > 0) {
+            getFragmentManager().popBackStack();
+        } else {
             activity.finish();
         }
     }