PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-06-26 23:23:39 +00:00
committed by Android (Google) Code Review
parent 04579cd603 58146c2b2f
commit 2a8354f693
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SettingsActivity.java
View File

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