commit e4084028b366581be06dba394fc0fa9ee737ec12
author Arc Wang <arcwang@google.com> Tue Sep 14 18:46:18 2021 +0800
committer Arc Wang <arcwang@google.com> Thu Sep 23 02:05:55 2021 +0000
tree 848512be1aaa2a0856d27962e40115d5a23f1c34
parent fdfac783aba9411ec5aa267d9d7792c493c23414

Merge intent extra to deep link intent target for large screen devices

Sender of deep link intent may want to send intent extra data to the
deep link target Activity by merging intent extra.

Bug: 197048599
Bug: 197926040
Test: manual
      1. Click quick Setting 'Internet button'.
      2. Click the gear button of a connected Wi-Fi.
      3. Observe if the Wi-Fi detail page shows the connected Wi-Fi.
Change-Id: I32040ee21a747cae710df2e12a8f5b66aff086fa

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index b82bb76..d5730a1 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -380,6 +380,7 @@
         // 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));