Merge "[Large sceen] Don't go Settings 2-pane deep link flow if not task root" into sc-v2-dev

2021-11-10 08:52:07 +00:00
parent 084cfd4142 0f5e75e098
commit 7c86d3d7a7
1 changed files with 3 additions and 2 deletions
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -370,8 +370,9 @@ public class SettingsActivity extends SettingsBaseActivity
        final SplitStateObserver splitStateObserver = new SplitStateObserver(this /* activity*/,
                true /* listenOnce */,
                splitInfos -> {
-                    if (!splitInfos.isEmpty()) {
-                        // It's already in 2-pane and no need to go 2-pane deep link flow.
+                    if (!splitInfos.isEmpty() || !SettingsActivity.this.isTaskRoot()) {
+                        // It's already in 2-pane or in a non-empty task, there is no need to go
+                        // 2-pane deep link flow.
                        return;
                    }