diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b82bb765629..d5730a12fbd 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -380,6 +380,7 @@ public class SettingsActivity extends SettingsBaseActivity // It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it. final Intent trampolineIntent = new Intent(android.provider.Settings.ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK); + trampolineIntent.replaceExtras(intent); trampolineIntent.putExtra( android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI, intent.toUri(Intent.URI_INTENT_SCHEME)); diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index c065c75c7b9..5df7b7a3cb1 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -213,6 +213,9 @@ public class SettingsHomepageActivity extends FragmentActivity implements targetIntent.setFlags(targetIntent.getFlags() & ~Intent.FLAG_ACTIVITY_NEW_TASK); + // Sender of intent may want to send intent extra data to the destination of targetIntent. + targetIntent.replaceExtras(intent); + targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true); // Set 2-pane pair rule for the deep link page.