Merge "Add missing display ID" into sc-dev

2021-03-05 20:29:57 +00:00
parent ed0d866aa7 9258cf087c
commit fd8f4ae270
1 changed files with 4 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4398,7 +4398,10 @@ public class StatusBar extends SystemUI implements DemoMode,
     */
    public static Bundle getActivityOptions(int displayId,
            @Nullable RemoteAnimationAdapter animationAdapter) {
-        return getDefaultActivityOptions(animationAdapter).toBundle();
+        ActivityOptions options = getDefaultActivityOptions(animationAdapter);
+        options.setLaunchDisplayId(displayId);
+        options.setCallerDisplayId(displayId);
+        return options.toBundle();
    }

    /**