diff options
author | Linus Tufvesson <lus@google.com> | 2020-04-30 16:54:12 +0000 |
---|---|---|
committer | Linus Tufvesson <lus@google.com> | 2020-05-01 18:34:59 +0100 |
commit | 7faec2493b53345802d21c77b2f1e07aa809332d (patch) | |
tree | 2f52ec5ace0c047d888df3f351dc90959e3451f3 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 4305c5fbf86d346b434ef888e224c84464d04093 (diff) |
RESTRICT AUTOMERGE
This change is the union of
I2aaab1903dee54190338f7b6e49888aa51437108 and I58834636e092f992e403342e36b475dc60e8f20a
Original CL descriptions:
*** I2aaab1903dee54190338f7b6e49888aa51437108
Block TYPE_PRESENTATION windows on default display
... and any other display that isn't considered a public presentation
display, as per Display.isPublicPresentation()
*** I58834636e092f992e403342e36b475dc60e8f20a
Use TYPE_PRIVATE_PRESENTATION for private presentations
Detect if the Presenation is targeting a private virtual display, and if they
are use the windowType TYPE_PRIVATE_PRESENTATION.
***
Bug: 141745510
Test: atest CtsWindowManagerDeviceTestCases:android.server.wm.PresentationTest CtsDisplayTestCases:android.display.cts.VirtualDisplayTest
Change-Id: I9f1c4b140ab4bc6183151aafc5501e8648fbc3fa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions