Merge "Make documentLaunchMode="never" activity don’t create task" into sc-dev

2021-03-17 08:57:57 +00:00
parent 30664e5ebd 72470f011b
commit 0c6e87b13f
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2707,7 +2707,8 @@ class ActivityStarter {
                    launchFlags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
                    break;
                case ActivityInfo.DOCUMENT_LAUNCH_NEVER:
-                    launchFlags &= ~FLAG_ACTIVITY_MULTIPLE_TASK;
+                    launchFlags &=
+                            ~(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | FLAG_ACTIVITY_MULTIPLE_TASK);
                    break;
            }
        }