diff options
| author | 2022-09-28 18:02:39 +0000 | |
|---|---|---|
| committer | 2022-09-28 18:02:39 +0000 | |
| commit | 1345dae0a582cd75ae6b8740eb09922935970842 (patch) | |
| tree | d6cb1f060b0f7aa15013550984fddbcf8f0b0b5f /libs/input/PointerController.cpp | |
| parent | 1b6809f5b1fa25a6b33a9dfd9ce33a5bba7bffc6 (diff) | |
| parent | 9391e9be6bb585b058bfc9800bcfb88c2648f562 (diff) | |
[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831af7 am: d78f1693ef -s ours am: 4b70b75d1c -s ours am: feba47c36a -s ours am: 0d3f936b8b -s ours am: 5387568458 -s ours am: bc66d3802b -s ours am: 93047c14a2 -s ours am: 9391e9be6b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067847
Change-Id: If3180837b3b3211371e1ecc7e01bad3a5ced9d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/PointerController.cpp')
0 files changed, 0 insertions, 0 deletions