Merge "Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow"

This commit is contained in:
Arc Wang
2022-08-11 01:17:03 +00:00
committed by Android (Google) Code Review
3 changed files with 0 additions and 5 deletions

View File

@@ -173,7 +173,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
if (userInfo.isManagedProfile()) {
final Intent intent = new Intent(getIntent())
.setClass(this, DeepLinkHomepageActivityInternal.class)
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
.putExtra(EXTRA_USER_HANDLE, getUser());
intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivityAsUser(intent, um.getPrimaryUser().getUserHandle());
@@ -451,7 +450,6 @@ public class SettingsHomepageActivity extends FragmentActivity implements
intent.setAction(null);
targetIntent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
targetIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
// Sender of intent may want to send intent extra data to the destination of targetIntent.
targetIntent.replaceExtras(intent);