summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-09-28 18:03:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 18:03:22 +0000
commit6ca6c6967e508555875f955ee83fa27619a5746b (patch)
tree5b06597a685dc1b157c9bc7f44bd25c6bd309346 /libs/input/PointerController.cpp
parent438ce32338d9c37798d93656c5ffe253ab058405 (diff)
parent9391e9be6bb585b058bfc9800bcfb88c2648f562 (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: I368c6356938a226d5380214785ef59d5ac098669 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