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

Merge "Fix back stack didn't perserved when Files Activity launched by Setting storage then back case."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-06-13 18:10:24 +00:00
committed by Android (Google) Code Review
parent 04233df504 9e25726593
commit 03460fc7e2
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -402,10 +402,14 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
try {
final int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, -1);
// b/33117269: Note that launchIntent may launch activity in different task which set
// different launchMode (e.g. Files), using startActivityForesult to set task as
// source task, and set requestCode as 0 means don't care about returnCode currently.
if (userId == -1) {
mFragment.startActivity(intent);
mFragment.startActivityForResult(intent, 0 /* requestCode not used */);
} else {
mFragment.getActivity().startActivityAsUser(intent, new UserHandle(userId));
mFragment.getActivity().startActivityForResultAsUser(intent,
0 /* requestCode not used */, new UserHandle(userId));
}
} catch (ActivityNotFoundException e) {
Log.w(TAG, "No activity found for " + intent);