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

Commit e91ef41e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set the package name to the deep link intent" into sc-v2-dev am: 46655e62 am: 2d9dc7df 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426484

Change-Id: If3f645bb0c778632662cf74c8049771319bcd57c
parents 00e72c41 2d9dc7df

src/com/android/settings/SettingsActivity.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -377,8 +377,9 @@ public class SettingsActivity extends SettingsBaseActivity 
    public static Intent getTrampolineIntent(Intent intent, String highlightMenuKey) {

    public static Intent getTrampolineIntent(Intent intent, String highlightMenuKey) {

        final Intent detailIntent = new Intent(intent);

        final Intent detailIntent = new Intent(intent);

        // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it.

        // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it.

        final Intent trampolineIntent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);

        final Intent trampolineIntent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY)

        trampolineIntent.replaceExtras(detailIntent);

                .setPackage(Utils.SETTINGS_PACKAGE_NAME)

                .replaceExtras(detailIntent);





        // Relay detail intent data to prevent failure of Intent#ParseUri.

        // Relay detail intent data to prevent failure of Intent#ParseUri.

        // If Intent#getData() is not null, Intent#toUri will return an Uri which has the scheme of

        // If Intent#getData() is not null, Intent#toUri will return an Uri which has the scheme of