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

am: 02ef5603b3 * commit '02ef5603b311e82ce3d849959c26b77723294eb5': Fixes stack overflow on some settings preferences
2016-02-11 00:40:12 +00:00
parent 13db86430b 02ef5603b3
commit 3e2a6c705a
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();
        }
    }