Merge "Fix bug #15431722 Uninstalling an app via settings leaves user on screen ...for the now uninstalled app"

This commit is contained in:
Fabrice Di Meglio
2014-06-26 23:23:39 +00:00
committed by Android (Google) Code Review

View File

@@ -798,7 +798,7 @@ public class SettingsActivity extends Activity
* preference panel is done. The launched panel must use
* {@link #finishPreferencePanel(Fragment, int, Intent)} when done.
* @param resultRequestCode If resultTo is non-null, this is the caller's
* request code to be received with the resut.
* request code to be received with the result.
*/
public void startPreferencePanel(String fragmentClass, Bundle args, int titleRes,
CharSequence titleText, Fragment resultTo, int resultRequestCode) {
@@ -826,6 +826,7 @@ public class SettingsActivity extends Activity
*/
public void finishPreferencePanel(Fragment caller, int resultCode, Intent resultData) {
setResult(resultCode, resultData);
finish();
}
/**