commit 656bc6004f7e7358832026c4196d02e50752ca7f
author Jason Monk <jmonk@google.com> Fri Jun 10 09:49:12 2016 -0400
committer Jason Monk <jmonk@google.com> Fri Jun 10 09:49:12 2016 -0400
tree dd782879ed79e7fe156fea9bde057c7b77b271a6
parent 7f7092c70512b24c1b640a8a039e89112ec31e12

Fix crash in finish from onCreate.

Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index f5d7d86..4796a9e 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -690,7 +690,10 @@
 
     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();
         }
     }