Merge "Fixes stack overflow on some settings preferences" into nyc-dev

2016-02-11 00:36:13 +00:00
parent dd3e761aa1 6a8b99dabe
commit 02ef5603b3
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -626,7 +626,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
    public void finish() {
        Activity activity = getActivity();
        if (activity != null && !activity.getFragmentManager().popBackStackImmediate()) {
-            finish();
+            activity.finish();
        }
    }