Merge "Revert "Remove FLAG_ACTIVITY_FORWARD_RESULT in 2-pane flow""

src/com/android/settings/SettingsActivity.java

@@ -439,6 +439,7 @@ 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;
     }
 

src/com/android/settings/homepage/SettingsHomepageActivity.java

@@ -178,6 +178,7 @@ 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());
@@ -496,6 +497,7 @@ 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);

src/com/android/settings/search/SearchResultTrampoline.java

@@ -100,6 +100,8 @@ public class SearchResultTrampoline extends Activity {
             }
         }
 
+        intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+
         if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) {
             startActivity(intent);
         } else if (isSettingsIntelligence(callingActivity)) {