From ea1580f92b9c8b0f33a86c6a1af872fd416b03d7 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 4 Aug 2022 16:24:35 +0800 Subject: [PATCH] Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow Settings$CreateShortcutActivity does not necessary to be displayed in 2-pane and it seems no scenario needs the flag Intent.FLAG_ACTIVITY_FORWARD_RESULT. Bug: 241346847 Test: build pass Change-Id: I7a8fca61b453db70233b151711df516649424e3a --- src/com/android/settings/SettingsActivity.java | 1 - src/com/android/settings/homepage/SettingsHomepageActivity.java | 2 -- src/com/android/settings/search/SearchResultTrampoline.java | 2 -- 3 files changed, 5 deletions(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 4341851c3fa..fd3fcdf0acf 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -415,7 +415,6 @@ public class SettingsActivity extends SettingsBaseActivity trampolineIntent.putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY, highlightMenuKey); - trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); return trampolineIntent; } diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index bad4a19c351..7752f32e2f5 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -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); diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java index 5e710293c2c..7718ff36330 100644 --- a/src/com/android/settings/search/SearchResultTrampoline.java +++ b/src/com/android/settings/search/SearchResultTrampoline.java @@ -95,8 +95,6 @@ public class SearchResultTrampoline extends Activity { } } - intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT); - if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) { startActivity(intent); } else if (isSettingsIntelligence(callingActivity)) {