Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea1580f9 authored by Arc Wang's avatar Arc Wang
Browse files

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
parent 66479d6d

src/com/android/settings/SettingsActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -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;

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -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);

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

+0 −2
Original line number Diff line number Diff line
@@ -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)) {