diff options
| author | Linus Tufvesson <lus@google.com> | 2020-05-05 11:13:51 +0100 |
|---|---|---|
| committer | Linus Tufvesson <lus@google.com> | 2020-05-05 18:55:09 +0100 |
| commit | 2bf126d042afc9678781146a36866e7b70365439 (patch) | |
| tree | 3e6370cd71fd96989aa3ad941efe0743ad5e4598 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e3f2048ffc5409b711c2f58e288b687e5b6fe710 (diff) | |
RESTRICT AUTOMERGE
This change is the union of
I2aaab1903dee54190338f7b6e49888aa51437108 and I58834636e092f992e403342e36b475dc60e8f20ai
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: cts-tradefed run cts -m CtsDisplayTestCases -t android.display.cts.VirtualDisplayTest
Test: Manually verfied that presentations are blocked on main display
Change-Id: I67c79c84ec2adfcdaf3b0f7bc7f0f41d30618e85
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions