Merge "Fixes stack overflow on some settings preferences" into nyc-dev am: 02ef5603b3

am: 3e2a6c705a * commit '3e2a6c705a36676ee898b5350aa1cc48a65a987e': Fixes stack overflow on some settings preferences
2016-02-11 01:14:07 +00:00
parent 900bc4b549 3e2a6c705a
commit dc05bf2726
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();
        }
    }