OSDN Git Service
TreeHugger Robot [Thu, 11 Nov 2021 19:41:07 +0000 (19:41 +0000)]
[automerger skipped] Merge "Check if the window is partially obscured for slippery enters" into rvc-dev am:
b27497c4bf am:
58c22be797 -s ours am:
fe2d5a037e -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
6e689ffe3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16194632
Change-Id: I97da34f4e5ff4a4a36cefcbfae46c894448d4247
Winson Chung [Thu, 11 Nov 2021 19:40:54 +0000 (19:40 +0000)]
[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am:
294e7b87e3 am:
90b88a978e -s ours am:
cb15467837 -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1
41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16224510
Change-Id: I3c9bba42b2f9b989b0cc2d2b91b3a3e938918752
Robin Lee [Thu, 11 Nov 2021 19:40:53 +0000 (19:40 +0000)]
[automerger skipped] DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor am:
41f48c7b10 am:
8c3de17e5d -s ours am:
03179cb3c9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: Iee441e740817d95a7033c96d6134c6a3beec554b
Winson Chung [Thu, 11 Nov 2021 19:40:52 +0000 (19:40 +0000)]
[automerger skipped] Add mechanism for a task's windows to be trusted overlays (SF) am:
7605fb4273 am:
cac2aa7517 -s ours am:
10b892cda2 -s ours
am skip reason: Merged-In Id92ccb087bd0d8dbaeeef3ba50b67fe015e53db8 with SHA-1
7605fb4273 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975348
Change-Id: Ie083bcf7b9c50a6f43c5937896cf19c47a5ca6b2
Chris Ye [Thu, 11 Nov 2021 19:40:51 +0000 (19:40 +0000)]
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. am:
39bc6117dd am:
020dd044a6 -s ours am:
5d53e37fe0 -s ours
am skip reason: Merged-In I58cf9f38c496e0ae8b2193dca45c0805e831bc9e with SHA-1
39bc6117dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975347
Change-Id: I7fd0f5006851287307c7e1059ad5e2893c5c19dc
TreeHugger Robot [Thu, 11 Nov 2021 19:22:47 +0000 (19:22 +0000)]
[automerger skipped] Merge "Check if the window is partially obscured for slippery enters" into rvc-dev am:
b27497c4bf am:
58c22be797 -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
6e689ffe3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16194632
Change-Id: I41bd81a055cfb319c650f15672b55d2b678037eb
Winson Chung [Thu, 11 Nov 2021 19:21:53 +0000 (19:21 +0000)]
[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am:
294e7b87e3 am:
90b88a978e -s ours
am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1
41f48c7b10 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16224510
Change-Id: I078c2d9eecb9e153824cd7ea381d2245c29bbd4d
Robin Lee [Thu, 11 Nov 2021 19:21:52 +0000 (19:21 +0000)]
[automerger skipped] DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor am:
41f48c7b10 am:
8c3de17e5d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I1fffbc8a266f26abfdda0d7965e8001ea24b6808
Winson Chung [Thu, 11 Nov 2021 19:21:50 +0000 (19:21 +0000)]
[automerger skipped] Add mechanism for a task's windows to be trusted overlays (SF) am:
7605fb4273 am:
cac2aa7517 -s ours
am skip reason: Merged-In Id92ccb087bd0d8dbaeeef3ba50b67fe015e53db8 with SHA-1
7605fb4273 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975348
Change-Id: Iddcca623eda377c55b3f2106b5122be428936f1f
Chris Ye [Thu, 11 Nov 2021 19:21:47 +0000 (19:21 +0000)]
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. am:
39bc6117dd am:
020dd044a6 -s ours
am skip reason: Merged-In I58cf9f38c496e0ae8b2193dca45c0805e831bc9e with SHA-1
39bc6117dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975347
Change-Id: Iac9f5d211d7ab954ab94d8824917b621044f3d54
TreeHugger Robot [Thu, 11 Nov 2021 18:58:55 +0000 (18:58 +0000)]
Merge "Check if the window is partially obscured for slippery enters" into rvc-dev am:
b27497c4bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16194632
Change-Id: I64d40d85f97fcc59f9061f73044dead69a58fdaa
Winson Chung [Tue, 9 Nov 2021 23:18:53 +0000 (23:18 +0000)]
Merge changes from topic "trusted_overlay_backport" into rvc-dev am:
294e7b87e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Bug:
196389741
Change-Id: I96eb392e3ace659305cccb2773ab715f6cc67eea
Merged-In: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa
Siarhei Vishniakou [Wed, 10 Nov 2021 03:51:02 +0000 (03:51 +0000)]
[automerger skipped] Check if the window is partially obscured for slippery enters am:
6e689ffe3f am:
224d576c0b am:
e26b6061f8 -s ours am:
eb59e4756d -s ours am:
8c83865531 -s ours am:
4986d714bf -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
d8c6ef2138 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16185286
Change-Id: I00e050a7cc2d62aebb628cb2daa19596c41d6171
Siarhei Vishniakou [Wed, 10 Nov 2021 03:31:46 +0000 (03:31 +0000)]
[automerger skipped] Check if the window is partially obscured for slippery enters am:
6e689ffe3f am:
224d576c0b am:
e26b6061f8 -s ours am:
eb59e4756d -s ours am:
8c83865531 -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
d8c6ef2138 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16185286
Change-Id: Ie6d4c961e9f95da4f0acbe6cd4665e1fc757f0b7
Siarhei Vishniakou [Wed, 10 Nov 2021 03:19:04 +0000 (03:19 +0000)]
[automerger skipped] Check if the window is partially obscured for slippery enters am:
6e689ffe3f am:
224d576c0b am:
e26b6061f8 -s ours am:
eb59e4756d -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
d8c6ef2138 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16185286
Change-Id: Ic4e82083fcc577c808292d6ae76c5d4e072e9c89
Siarhei Vishniakou [Wed, 10 Nov 2021 03:06:07 +0000 (03:06 +0000)]
[automerger skipped] Check if the window is partially obscured for slippery enters am:
6e689ffe3f am:
224d576c0b am:
e26b6061f8 -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
d8c6ef2138 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16185286
Change-Id: I3fa807e2a5e61dfad45b5e27e3116e9e64338c8b
Siarhei Vishniakou [Wed, 10 Nov 2021 02:55:28 +0000 (02:55 +0000)]
Check if the window is partially obscured for slippery enters am:
6e689ffe3f am:
224d576c0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16185286
Change-Id: I49fb56b83a8799ac6a380b269bca06adc5289aba
Siarhei Vishniakou [Wed, 10 Nov 2021 02:44:01 +0000 (02:44 +0000)]
Check if the window is partially obscured for slippery enters am:
6e689ffe3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16185286
Change-Id: I6645db77a493d55aacc8f645db625ea5f89a8d36
TreeHugger Robot [Wed, 10 Nov 2021 01:06:24 +0000 (01:06 +0000)]
[automerger skipped] Merge "Check if the window is partially obscured for slippery enters" into rvc-dev am:
b27497c4bf am:
1158690bb7 -s ours am:
56b929e3e7 -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
870ececa8d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16194632
Change-Id: Iff92d8b7d7cae9f6d4c4527f2d65f89742fef26b
TreeHugger Robot [Wed, 10 Nov 2021 00:41:53 +0000 (00:41 +0000)]
[automerger skipped] Merge "Check if the window is partially obscured for slippery enters" into rvc-dev am:
b27497c4bf am:
1158690bb7 -s ours
am skip reason: Merged-In I93d9681479f41244ffed4b1f88cceb69be71adf2 with SHA-1
870ececa8d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16194632
Change-Id: I58801fbec843c7c1e09fa9f0a51eed9c8225c839
Winson Chung [Wed, 10 Nov 2021 00:19:22 +0000 (00:19 +0000)]
Merge changes from topic "trusted_overlay_backport" into rvc-dev am:
294e7b87e3 am:
e93bd77429 am:
f13c62852e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: Iff1f45324e088239c71593777e4d521ea6f4937a
Robin Lee [Wed, 10 Nov 2021 00:19:22 +0000 (00:19 +0000)]
[automerger skipped] DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor am:
41f48c7b10 am:
cf8e45638d -s ours am:
6b44d942a9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I01a1a627578e8c95f6ffe8da07cc04a04129a46e
Winson Chung [Wed, 10 Nov 2021 00:19:21 +0000 (00:19 +0000)]
[automerger skipped] Add mechanism for a task's windows to be trusted overlays (SF) am:
7605fb4273 am:
4df1658eda -s ours am:
ede8f4d536 -s ours
am skip reason: Merged-In Id92ccb087bd0d8dbaeeef3ba50b67fe015e53db8 with SHA-1
a30f7c9974 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975348
Change-Id: I6f9bb604284a68e4feeefca0e384b2f6f600d850
Chris Ye [Wed, 10 Nov 2021 00:19:20 +0000 (00:19 +0000)]
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. am:
39bc6117dd am:
8bec11e493 -s ours am:
139309f468 -s ours
am skip reason: Merged-In I58cf9f38c496e0ae8b2193dca45c0805e831bc9e with SHA-1
fcdff3e735 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975347
Change-Id: I1b2cf100831a8535b497ae4fa685231ba9876b1b
Steven Moreland [Wed, 10 Nov 2021 00:18:58 +0000 (00:18 +0000)]
[automerger skipped] avoid extra release of unowned objects in Parcel error path am:
d668098e47 am:
41db1b0e7c -s ours am:
c4fe8c2478 -s ours
am skip reason: Merged-In I34411675687cb3d18bffa082984ebdf308e1c1a6 with SHA-1
d668098e47 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177016
Change-Id: I904d09f651f803ac1839cbab27b9a91936e8e133
Steven Moreland [Wed, 10 Nov 2021 00:18:41 +0000 (00:18 +0000)]
[automerger skipped] avoid extra release of unowned objects in Parcel error path am:
d668098e47 am:
d471beffd1 -s ours am:
57380b88ba -s ours
am skip reason: Merged-In I34411675687cb3d18bffa082984ebdf308e1c1a6 with SHA-1
7c8497e012 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177016
Change-Id: I8fd02cbeeae4a7e90fce6f3f718ad641bc4ce875
TreeHugger Robot [Wed, 10 Nov 2021 00:18:34 +0000 (00:18 +0000)]
Merge "Check if the window is partially obscured for slippery enters" into rvc-dev am:
b27497c4bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16194632
Change-Id: I597107cf0a85b6dbc73dcc4092d3c077d678e661
TreeHugger Robot [Tue, 9 Nov 2021 23:53:32 +0000 (23:53 +0000)]
Merge "Check if the window is partially obscured for slippery enters" into rvc-dev
Winson Chung [Tue, 9 Nov 2021 23:42:36 +0000 (23:42 +0000)]
Merge changes from topic "trusted_overlay_backport" into rvc-dev am:
294e7b87e3 am:
e93bd77429
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I48c83881683865b1b9d1de1d4a63531a84112cf6
Robin Lee [Tue, 9 Nov 2021 23:42:34 +0000 (23:42 +0000)]
[automerger skipped] DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor am:
41f48c7b10 am:
cf8e45638d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I5359f45577d476b0fe0d14367b046bee00e64f7e
Winson Chung [Tue, 9 Nov 2021 23:42:31 +0000 (23:42 +0000)]
[automerger skipped] Add mechanism for a task's windows to be trusted overlays (SF) am:
7605fb4273 am:
4df1658eda -s ours
am skip reason: Merged-In Id92ccb087bd0d8dbaeeef3ba50b67fe015e53db8 with SHA-1
a30f7c9974 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975348
Change-Id: Ifa92f0a463c513896f4ffa417a65002d89847be8
Chris Ye [Tue, 9 Nov 2021 23:42:30 +0000 (23:42 +0000)]
[automerger skipped] Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. am:
39bc6117dd am:
8bec11e493 -s ours
am skip reason: Merged-In I58cf9f38c496e0ae8b2193dca45c0805e831bc9e with SHA-1
fcdff3e735 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975347
Change-Id: I19e8bd2cdbacdd8f15c400e047f744927934b52e
Steven Moreland [Tue, 9 Nov 2021 23:41:50 +0000 (23:41 +0000)]
[automerger skipped] avoid extra release of unowned objects in Parcel error path am:
d668098e47 am:
41db1b0e7c -s ours
am skip reason: Merged-In I34411675687cb3d18bffa082984ebdf308e1c1a6 with SHA-1
d668098e47 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177016
Change-Id: I4eb1f071d3e5556e0a34a3b64c7e7b11f6a391bc
Steven Moreland [Tue, 9 Nov 2021 23:40:51 +0000 (23:40 +0000)]
[automerger skipped] avoid extra release of unowned objects in Parcel error path am:
d668098e47 am:
d471beffd1 -s ours
am skip reason: Merged-In I34411675687cb3d18bffa082984ebdf308e1c1a6 with SHA-1
7c8497e012 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177016
Change-Id: I3c25c7887fefde636fc6b2e29c2baca0ef85d52d
Winson Chung [Tue, 9 Nov 2021 23:21:01 +0000 (23:21 +0000)]
Merge changes from topic "trusted_overlay_backport" into rvc-dev am:
294e7b87e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I82ff44bf8945c25f93934ce0d66a9d6df79c39c0
Robin Lee [Tue, 9 Nov 2021 23:21:00 +0000 (23:21 +0000)]
DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor am:
41f48c7b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I0912c6d109ad74b0525cc5505a77177ed1f96e4a
Winson Chung [Tue, 9 Nov 2021 23:20:59 +0000 (23:20 +0000)]
Add mechanism for a task's windows to be trusted overlays (SF) am:
7605fb4273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975348
Change-Id: I4058c131ac922d0a13482465c08dab0f94d3cab1
Chris Ye [Tue, 9 Nov 2021 23:20:58 +0000 (23:20 +0000)]
Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. am:
39bc6117dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975347
Change-Id: I16c075529730d5d7aab08fa0779dac436aa956e4
Robin Lee [Tue, 9 Nov 2021 23:18:52 +0000 (23:18 +0000)]
DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor am:
41f48c7b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975349
Change-Id: I7ddafc10faa4f00eebe4505327f312f1035a11d7
Winson Chung [Tue, 9 Nov 2021 23:18:51 +0000 (23:18 +0000)]
Add mechanism for a task's windows to be trusted overlays (SF) am:
7605fb4273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975348
Change-Id: I23c2b8453f21a1d05b533a95bc82601d013a7319
Chris Ye [Tue, 9 Nov 2021 23:18:50 +0000 (23:18 +0000)]
Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. am:
39bc6117dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15975347
Change-Id: I4bcdda3e303a6842d5cdfd3227b298e4e5c6429e
Steven Moreland [Tue, 9 Nov 2021 23:18:19 +0000 (23:18 +0000)]
avoid extra release of unowned objects in Parcel error path am:
d668098e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177016
Change-Id: I339bd999acca04d1a5252a1d3237200a1bbf0088
Steven Moreland [Tue, 9 Nov 2021 23:15:53 +0000 (23:15 +0000)]
avoid extra release of unowned objects in Parcel error path am:
d668098e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177016
Change-Id: Ieee2d8a542b2ebe0f73c179dc7912bf02255892c
Winson Chung [Tue, 9 Nov 2021 23:03:14 +0000 (23:03 +0000)]
Merge changes from topic "trusted_overlay_backport" into rvc-dev
* changes:
DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor
Add mechanism for a task's windows to be trusted overlays (SF)
Change InputWindowInfo::isTrustedOverlay() to be permission and flag based.
Siarhei Vishniakou [Wed, 9 Dec 2020 18:07:46 +0000 (08:07 -1000)]
Check if the window is partially obscured for slippery enters
Currently, we only check whether a window is partially obscured during
the initial tap down. However, there is another use case: slippery
enter.
During a slippery enter, the touch down is generated into the
slipped-into window, and touch cancel is generated for the slipped-from
window. The window receiving the slippery enter does not need to have
any flags.
Until we figure out whether we can restrict the usage of this flag to
system components, add this check as an intermediate fix.
Bug:
157929241
Test: atest FlagSlipperyTest
Test: atest inputflinger_tests
Change-Id: I93d9681479f41244ffed4b1f88cceb69be71adf2
Merged-In: I93d9681479f41244ffed4b1f88cceb69be71adf2
Steven Moreland [Tue, 9 Nov 2021 22:15:21 +0000 (22:15 +0000)]
avoid extra release of unowned objects in Parcel error path am:
7c8497e012
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
16177015
Change-Id: Ifcbf7e9fbfd7807fde9b8dc5fd79317a7a45c65f
Robin Lee [Fri, 10 Sep 2021 12:03:42 +0000 (12:03 +0000)]
DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor
To avoid it being initialised to true randomly.
Bug:
199483370
Bug:
196389741
Change-Id: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa
Merged-In: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa
Winson Chung [Tue, 29 Jun 2021 22:42:56 +0000 (15:42 -0700)]
Add mechanism for a task's windows to be trusted overlays (SF)
- Add a layer state to indicate that this layer and its children
in the hierarchy are trusted. This can only be set by callers
holding ACCESS_SURFACE_FLINGER, and will be used for the PIP
task layer to indicate that activities in PIP are trusted (as
they are controlled only by the user and SystemUI)
Bug:
191529039
Bug:
196389741
Test: TBD
Change-Id: Id92ccb087bd0d8dbaeeef3ba50b67fe015e53db8
Merged-In: Id92ccb087bd0d8dbaeeef3ba50b67fe015e53db8
Chris Ye [Sun, 10 May 2020 22:16:04 +0000 (15:16 -0700)]
Change InputWindowInfo::isTrustedOverlay() to be permission and flag based.
Add private flag to WindowManager.LayoutParams. If the flag is set,
check if caller has INTERNAL_SYSTEM_WINDOW permission.
Bug:
155781676
Bug:
196389741
Test: atest WindowManagerServiceTests
Change-Id: I58cf9f38c496e0ae8b2193dca45c0805e831bc9e
Merged-In: I58cf9f38c496e0ae8b2193dca45c0805e831bc9e
Siarhei Vishniakou [Wed, 9 Dec 2020 18:07:46 +0000 (08:07 -1000)]
Check if the window is partially obscured for slippery enters
Currently, we only check whether a window is partially obscured during
the initial tap down. However, there is another use case: slippery
enter.
During a slippery enter, the touch down is generated into the
slipped-into window, and touch cancel is generated for the slipped-from
window. The window receiving the slippery enter does not need to have
any flags.
Until we figure out whether we can restrict the usage of this flag to
system components, add this check as an intermediate fix.
Bug:
157929241
Test: atest FlagSlipperyTest
Test: atest inputflinger_tests
Change-Id: I93d9681479f41244ffed4b1f88cceb69be71adf2
Merged-In: I93d9681479f41244ffed4b1f88cceb69be71adf2
(cherry picked from commit
870ececa8d5dfb293e671c716f98ccddae24147f)
Steven Moreland [Tue, 2 Nov 2021 01:17:23 +0000 (18:17 -0700)]
avoid extra release of unowned objects in Parcel error path
Another bug due to a huge amount of complexity in the Parcel
implementation.
Bug:
203847542
Test: added testcase fails on device w/o Parcel.cpp fix, and it passes
on a device with the fix
Merged-In: I34411675687cb3d18bffa082984ebdf308e1c1a6
Change-Id: I34411675687cb3d18bffa082984ebdf308e1c1a6
(cherry picked from commit
04390376b043bf6a15ff2943a9ed63d9d8173842)
Steven Moreland [Tue, 2 Nov 2021 01:17:23 +0000 (18:17 -0700)]
avoid extra release of unowned objects in Parcel error path
Another bug due to a huge amount of complexity in the Parcel
implementation.
Bug:
203847542
Test: added testcase fails on device w/o Parcel.cpp fix, and it passes
on a device with the fix
Merged-In: I34411675687cb3d18bffa082984ebdf308e1c1a6
Change-Id: I34411675687cb3d18bffa082984ebdf308e1c1a6
(cherry picked from commit
04390376b043bf6a15ff2943a9ed63d9d8173842)
Chris Kuiper [Thu, 14 Oct 2021 23:29:58 +0000 (23:29 +0000)]
Merge changes Ib7a08010,Idd72b82e into sc-qpr1-dev
* changes:
sensorservice: Track Proximity state change when app goes idle.
sensorservice: Refactor tracking logic for the Proximity sensor.
TreeHugger Robot [Thu, 14 Oct 2021 23:17:51 +0000 (23:17 +0000)]
Merge "binderRpcTest: disable" into sc-qpr1-dev
Chris Kuiper [Tue, 12 Oct 2021 23:36:43 +0000 (16:36 -0700)]
sensorservice: Track Proximity state change when app goes idle.
This tracks the Proximity state change when an app subscribed to the
Proximity sensor goes idle and its connection is paused.
Bug: b/
202328704
Tests: See b/
202328704#comment9 for tests done.
Change-Id: Ib7a08010d903406b67940de56a49e9efb200ad68
Chris Kuiper [Tue, 12 Oct 2021 23:30:01 +0000 (16:30 -0700)]
sensorservice: Refactor tracking logic for the Proximity sensor.
This simplifies the code that tracks if the proximity sensor is
active by removing all counting of clients and simply checking the
sensor's isSensorActive() method and reporting changes to it.
Bug: b/
202328704
Tests: See b/
202328704#comment9 for tests done.
Change-Id: Idd72b82ed0fd5ee089e795ab4b233241350979c2
TreeHugger Robot [Fri, 24 Sep 2021 15:27:43 +0000 (15:27 +0000)]
Merge "Repeat proxy limit callbacks if we keep going above the limit." into sc-qpr1-dev
Martijn Coenen [Fri, 3 Sep 2021 16:06:24 +0000 (18:06 +0200)]
Repeat proxy limit callbacks if we keep going above the limit.
When we hit the high watermark for number of live proxies in a process,
we call a callback with the offending UID. ActivityManagerService will
then kill all processes belonging to this UID. The proxy limit callback
is only "re-armed" when the number of proxies for that UID drops below a
certain value again. However, because the proxies beloging to the now
dead processes will only be removed when the GC next runs, and restarted
processes may start adding new proxies in the mean time, we may actually
never drop below the lower threshold again, and never fire the callback
again, despite an ever-increasing amount of proxies.
To prevent this, repeatedly fire the limit callback every time that we
go another # of high watermark proxies over the limit. This, in
combination with a GC in the framework, should make sure that we
regularly kill and clean up these processes.
Bug:
198340142
Test: Manual
Change-Id: I8d877d409863fdae9cffd43709b647d0c1edb440
Merged-In: I8d877d409863fdae9cffd43709b647d0c1edb440
Steven Moreland [Thu, 23 Sep 2021 23:49:35 +0000 (16:49 -0700)]
binderRpcTest: disable
This test is disabled in S, and some of the fixes required for old
kernels aren't present here, but new systems are pulling it in.
Fixes:
200742446
Merged-In: Ieaeee990843aafdf6baedadd2f26177d53feeb96
Change-Id: I7d50218c7a645196a9f92f9b4f0a2cd7c447eef5
Prabir Pradhan [Fri, 6 Aug 2021 14:01:18 +0000 (14:01 +0000)]
Use sequence numbers to synchronize enabling Pointer Capture (1/2)
InputReader only processes configuration change from its main thread.
This means that if there is more than one Pointer Capture change
request when the thread is busy or sleeping, it will only process the
latest one. To ensure requests to enable Pointer Capture are synchronized
with Dispatcher, we must use sequence numbers.
Requests to enable Pointer Capture have a sequence number. Requests to
disable Pointer Capture do not have a value.
Bug:
195312888
Test: atest inputflinger_tests
Test: manual with GeforceNow app, see bug.
Merged-In: I6ae9c5498dc2f783b4c7211fa3665d42e29d2919
Change-Id: I6ae9c5498dc2f783b4c7211fa3665d42e29d2919
Li Li [Wed, 15 Sep 2021 04:00:04 +0000 (04:00 +0000)]
Merge "getProcessFreezeInfo reads more info from kernel" into sc-qpr1-dev
Li Li [Fri, 10 Sep 2021 16:59:30 +0000 (09:59 -0700)]
getProcessFreezeInfo reads more info from kernel
Improve primitive binder function to check if a process has any pending
binder transactions so that the freezer policy can choose to wait and
drain those pending transactions.
Bug:
198493121
Test: app launch/foreground/background stress test
Change-Id: Ia7ce6899ddaeb8e8453b0b8f3536d129b6b761d3
Merged-In: Ia7ce6899ddaeb8e8453b0b8f3536d129b6b761d3
Derek Sollenberger [Fri, 10 Sep 2021 12:05:47 +0000 (12:05 +0000)]
Merge "Add support for latching unsignaled buffers in Skia RenderEngine." into sc-qpr1-dev
Vishnu Nair [Thu, 9 Sep 2021 16:04:40 +0000 (16:04 +0000)]
[automerger skipped] Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy am:
fe4d05cd44 -s ours
am skip reason: Merged-In I88fe98fa275dd76e20a5403c24bd2cb3bee5346d with SHA-1
c0fa0078cf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15787430
Change-Id: I1a5f35936417277b7a96bc6b7796f58ee72c428a
Alec Mouri [Wed, 11 Aug 2021 17:36:55 +0000 (10:36 -0700)]
Add support for latching unsignaled buffers in Skia RenderEngine.
When we re-added support for latching unsignaled buffers we forgot to
propagate this support to Skia RenderEngine, since we were assuming that
latching unsignaled buffers would no longer be supported.
Because partners are still relying on latching unsignaled buffers being
available for good performance in some use-cases, Skia RenderEngine
needs to wait on incoming buffer fences to prevent tearing.
Bug:
196201621
Bug:
195033578
Test: atest librenderengine_test
Merged-In: I1f3be882e55de20bdbfa3bf92bf0b8f88b8bc3ea
Change-Id: I1f3be882e55de20bdbfa3bf92bf0b8f88b8bc3ea
(cherry picked from commit
4ee7b493f770fefc81076131913061cfd407288f)
Vishnu Nair [Mon, 30 Aug 2021 22:31:08 +0000 (15:31 -0700)]
Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy
SurfaceView clients may hold on to surface references. In S this means
they would extend the lifetime of the SurfaceControl resulting in
"leaking" buffers until the references are cleared or the app is
terminated.
Fix this by calling a new destroy function on Surface which will
explicitly remove references to the SurfaceControl and BBQ it holds.
This is safe because SurfaceView controls the lifecycle of the Surface
and knows when the Surface will become invalid. Once invalid, the Surface
cannot become valid again.
Test: repro steps in bug
Bug:
198133921
Change-Id: I88fe98fa275dd76e20a5403c24bd2cb3bee5346d
Merged-In: I88fe98fa275dd76e20a5403c24bd2cb3bee5346d
Vishnu Nair [Wed, 8 Sep 2021 01:10:00 +0000 (01:10 +0000)]
Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-qpr1-dev
Steven Moreland [Tue, 7 Sep 2021 23:30:06 +0000 (23:30 +0000)]
[automerger skipped] libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990 am:
62eaabc324 am:
d21fe3951a -s ours am:
bb79edeabe -s ours
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15759163
Change-Id: I8f306c86ebd3ae91e82c97a75f482b3f528e02e0
Steven Moreland [Tue, 7 Sep 2021 23:26:44 +0000 (23:26 +0000)]
[automerger skipped] libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990 am:
62eaabc324 am:
d21fe3951a -s ours
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15759163
Change-Id: Iec5da912d314e933555e504fefb9705fe0233634
Steven Moreland [Tue, 7 Sep 2021 23:26:19 +0000 (23:26 +0000)]
[automerger skipped] libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990 am:
62eaabc324 am:
8cec52154e -s ours am:
993b1603d4 -s ours
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15759163
Change-Id: I98a5f9bb0bc2492e3e1138abbb297eaf3f48fd9c
Steven Moreland [Tue, 7 Sep 2021 23:04:56 +0000 (23:04 +0000)]
[automerger skipped] libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990 am:
62eaabc324 am:
8cec52154e -s ours
am skip reason: skipped by user smoreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15759163
Change-Id: I7231522436c89fe75b0d96bd1c704545cef38bd9
Steven Moreland [Tue, 7 Sep 2021 22:19:47 +0000 (22:19 +0000)]
libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990 am:
62eaabc324
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15759163
Change-Id: I53b504bbb6299988939674ba2b21344569c0da6d
Steven Moreland [Tue, 7 Sep 2021 22:19:46 +0000 (22:19 +0000)]
libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990 am:
62eaabc324
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15759163
Change-Id: Ie9e50a46e486fecafac61d66b79095687d671a3f
Steven Moreland [Fri, 3 Sep 2021 22:39:10 +0000 (22:39 +0000)]
libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3 am:
d666af6990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15720346
Bug:
197336441
Change-Id: I703760ecbfa007d27caf76556ed21bbf0558df80
Steven Moreland [Fri, 3 Sep 2021 22:22:58 +0000 (22:22 +0000)]
libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b am:
17aa765fd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15720346
Change-Id: I51d7e7341d8af4788dbc224b7ab22129c235aa52
Steven Moreland [Fri, 3 Sep 2021 22:08:10 +0000 (22:08 +0000)]
libbinder: uptimeMillis returns int64_t! am:
3ba4963f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15720346
Change-Id: Ic08346b606933f364a2dbdad7a09c97b9ef059e7
Vishnu Nair [Mon, 30 Aug 2021 22:31:08 +0000 (15:31 -0700)]
Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy
SurfaceView clients may hold on to surface references. In S this means
they would extend the lifetime of the SurfaceControl resulting in
"leaking" buffers until the references are cleared or the app is
terminated.
Fix this by calling a new destroy function on Surface which will
explicitly remove references to the SurfaceControl and BBQ it holds.
This is safe because SurfaceView controls the lifecycle of the Surface
and knows when the Surface will become invalid. Once invalid, the Surface
cannot become valid again.
Test: repro steps in bug
Bug:
198133921
Change-Id: I88fe98fa275dd76e20a5403c24bd2cb3bee5346d
Merged-In: I88fe98fa275dd76e20a5403c24bd2cb3bee5346d
Alec Mouri [Thu, 19 Aug 2021 23:52:34 +0000 (16:52 -0700)]
Use a separate mutex for BLASTBufferQueue in BLASTBufferItemConsumer
Avoids the following deadlock...
Thread 1:
* BLASTBufferQueue::transactionCallback acquires
BLASTBufferQueue::mMutex
* BLASTBufferItemConsumer::updateFrameTimestamps waits to
acquire BLASTBufferItemConsumer::mMutex
Thread 2:
* BLASTBufferItemConsumer::onSidebandStreamChanged acquires
BLASTBufferItemConsumer::mMutex
* BLASTBufferQueue::setSidebandStream tries to acquire
BLASTBufferQueue::mMutex
Bug:
192998815
Test: Both CTS Media and Mediav2 (by partner)
Change-Id: I37523031841db3f1a29481bbfa76d6c028a6942e
Ady Abraham [Tue, 31 Aug 2021 16:27:29 +0000 (16:27 +0000)]
Merge "SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE" into sc-qpr1-dev
TreeHugger Robot [Tue, 31 Aug 2021 16:17:21 +0000 (16:17 +0000)]
Merge "swapchain: always return a signle image for shared presentation mode" into sc-qpr1-dev
Steven Moreland [Mon, 30 Aug 2021 22:41:44 +0000 (15:41 -0700)]
libbinder: uptimeMillis returns int64_t!
This was limiting device uptime to ~1 month. Certainly, devices should
update more frequently, but that decision should not be because of
ubsan!
This is a partial copy of the change
Ifa00c32ee184795b03e16b39ac70ff41ebf00331 here.
Bug:
197336441
Test: TH
Merged-In: Ifa00c32ee184795b03e16b39ac70ff41ebf00331
Change-Id: Ib9f3e63e968ac77f0f6ea6447d586db588e9dbe4
Ady Abraham [Tue, 27 Jul 2021 23:27:56 +0000 (16:27 -0700)]
SF: fix a bug with DISPLAY_EVENT_MODE_CHANGE
SF might dispatch a DISPLAY_EVENT_MODE_CHANGE event before changing
the actual mode. This can happen when the mode change takes more than
a single refresh and caused by incorrectly checking the previously
reported event without checking for the current mode.
Bug:
194515308
Bug:
193945763
Test: SF unit tests
Change-Id: Icf44e0fb6aadb76e629cd408907389e2626d2047
Merged-In: Icf44e0fb6aadb76e629cd408907389e2626d2047
TreeHugger Robot [Fri, 27 Aug 2021 20:03:54 +0000 (20:03 +0000)]
Merge "Remove support: libfeature_support_angle.so" into sc-qpr1-dev
Ady Abraham [Thu, 26 Aug 2021 20:12:30 +0000 (13:12 -0700)]
swapchain: always return a signle image for shared presentation mode
Bug:
197790618
Test: atest CtsDeqpTestCases -- --module-arg CtsDeqpTestCases:include-filter:dEQP-VK.wsi.android.*
Change-Id: If3c086479dfc03af31f503216294eba4fba989de
Tim Van Patten [Fri, 21 May 2021 23:51:59 +0000 (17:51 -0600)]
Remove support: libfeature_support_angle.so
Remove support for ANGLE's libfeature_support_angle.so.
This also removes all of the logic related to checking the rules file,
since libfeature_support_angle.so is what parsed the JSON rules file.
Bug: b/
187342779
Bug: b/
184757175
Test: make and manual verification ANGLE is loaded
Change-Id: I3c52b07eb262f83f8e860584790ac058de58466a
Merged-In: I3c52b07eb262f83f8e860584790ac058de58466a
Ady Abraham [Fri, 20 Aug 2021 17:11:31 +0000 (10:11 -0700)]
SF: Tune RefreshRateConfigs for close refresh rates
Partial cherry-pick of
15a0fc65eedb633f4fbf988e4a319452ddaebdcc
to fix seen in CTS
Bug:
196404992
Bug:
196191168
Test: atest CtsDisplayTestCases.android.display.cts.DisplayTest#testModeSwitchOnPrimaryDisplay
Change-Id: I9f8abac183bf6255fed4e2481d22aa3eb42b72ac
Merged-In: I694e2aa5b16e9b4e0f6d1e8263b1ac35099605fd
Xin Li [Fri, 13 Aug 2021 20:53:32 +0000 (20:53 +0000)]
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am:
62d46ebc11 -s ours
am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1
52846cd871 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/
15550161
Change-Id: I5af46ba65d1c26d1218b68068ef5710a6056e672
Xin Li [Fri, 13 Aug 2021 00:49:09 +0000 (17:49 -0700)]
Merge stage-aosp-sc-ts-dev before making it an upstream
Bug:
169893837
Merged-In: I2a2d02a0d7e67ee9577857a210cb6157683e5598
Change-Id: I0c4b099b959d66900eebc2624c85e000a84e9c54
Vishnu Nair [Wed, 21 Jul 2021 01:49:42 +0000 (18:49 -0700)]
SurfaceFlinger: Safely cast from IBinder to Layer::Handle
Bug: b/
193034677, b/
193034683, b/
193033243
Test: go/wm-smoke, presubmit
Change-Id: Iece64fca254edfd0b82e05ad9629824b2364cc13
Merged-In: Iece64fca254edfd0b82e05ad9629824b2364cc13
The Android Open Source Project [Thu, 12 Aug 2021 19:03:37 +0000 (12:03 -0700)]
Merge ab/
7633965
Bug:
169893837
Merged-In: I2a2d02a0d7e67ee9577857a210cb6157683e5598
Change-Id: Iecdf0a17afe650483461978b42161940ce002101
Vishnu Nair [Fri, 6 Aug 2021 15:13:41 +0000 (15:13 +0000)]
Merge "Blast: Fix missing release callbacks for shared buffers" into sc-dev
Ady Abraham [Fri, 6 Aug 2021 03:14:17 +0000 (03:14 +0000)]
Merge "SF: fix frame rate for layer tree" into sc-dev
Vishnu Nair [Thu, 5 Aug 2021 23:12:48 +0000 (16:12 -0700)]
Blast: Fix missing release callbacks for shared buffers
Fixes an issue where buffers were compared only using the buffer id.
In shared buffer mode, the client will queue up the same buffer id
multiple times so we need to distinguish using the frame number as
well.
Test: https://buganizer.corp.google.com/issues/
195447981#comment18
Fixes:
195447981
Change-Id: I2a2d02a0d7e67ee9577857a210cb6157683e5598
Ady Abraham [Wed, 4 Aug 2021 20:04:37 +0000 (13:04 -0700)]
SF: fix frame rate for layer tree
With the current implementation we might mark layers as NoVote
incorrectly when a sibling has a frame rate.
Test: adb shell /data/nativetest64/libsurfaceflinger_unittest/libsurfaceflinger_unittest
Bug:
195205467
Change-Id: I62641f855a027e1192f9a85a4bc50692b1744764
Chris Kuiper [Wed, 4 Aug 2021 06:08:10 +0000 (23:08 -0700)]
sensorservice: ProximitySensor needs to report correct sensor state.
Calls to ProximitySensor::activate() may repeatedly set enabled=true.
The current logic doesn't account for that. In order to correctly
report the current sensor state, simply use
mSensorDevice.isSensorActive() instead.
Bug:
194878856
Test: 1) Reproduced problem and verified mIsProxActive in "dumpsys
display" contains the correct value and no more 60/90Hz
flicker.
2) Adding local debugs, then mixing making phone calls with
additional "sensor_test sample -s8 -n5" commands to create
several Prox clients, and verifying logged flags and
reference counts.
Change-Id: I2342844ff4e6301a6b9ac8a33dc3e6047fca83ad
Chris Kuiper [Wed, 4 Aug 2021 22:06:11 +0000 (15:06 -0700)]
sensorservice: Fix SensorDevice::isSensorActive().
SensorDevice::isSensorActive() currently returns
"numActiveClients() > 0", but it should return ".isActive".
An "active client" is really one that has some requested batching
parameters stored, which it can do even while the sensor is disabled
but, the isActive bool tracks whether the the sensor is currently
enabled at the HAL, which is what we really want.
Bug: b/
194878856
Test: Together with ag/
15459770:
1) Reproduced problem and verified mIsProxActive in "dumpsys
display" contains the correct value and no more 60/90Hz
flicker.
2) Adding local debugs, then mixing making phone calls with
additional "sensor_test sample -s8 -n5" commands to create
several Prox clients, and verifying logged flags and
reference counts.
Change-Id: Id4a13ebb5cde8de87ee7547d2989c3c0d1a69a09
Vishnu Nair [Mon, 2 Aug 2021 23:35:39 +0000 (23:35 +0000)]
Merge "SurfaceView: Synchronize destframe updates with SurfaceView size changes" into sc-dev
Vishnu Nair [Fri, 30 Jul 2021 23:07:42 +0000 (16:07 -0700)]
SurfaceView: Synchronize destframe updates with SurfaceView size changes
This CL fixes one of the issues with SurfaceView parent frame and
content syncing.
With BLAST, we have two surface controls each setting a scale. The
parent surface control sets a scale based on the requested surface
size and the SurfaceView layout size. The BlastBufferQueue surface
control scales the buffer to the requested buffer size if the buffer
has the appropriate scale mode.
The destination frame controls the second scaling and it must be
applied with the parent surface scale changes. This cl fixes flickers
where the requested fixed surface size changes without any view size
changes. This cl allows the caller to pass in a transaction to
BLASTBufferQueue#update which is updated with the destination frame
changes. This transaction can then be applied with the parent
surface changes.
This also fixes an issue where destination Frame was being set on
every buffer update and when we updated the BlastBufferQueue size.
Since buffer transactions can be queued up on the server side, a
stale value maybe applied for a few frames causing flickers.
Fixes:
194458377
Test: bug repro steps
Test: atest SurfaceViewSyncTest#testSurfaceViewSetFixedSize
Change-Id: I216586842ff45bfd398659b5cc0c89eaf51394ff
Rob Carr [Thu, 29 Jul 2021 22:04:56 +0000 (22:04 +0000)]
Merge "Don't call invalidateHwcGeometry when handling transactions" into sc-dev
Rob Carr [Thu, 29 Jul 2021 22:04:47 +0000 (22:04 +0000)]
Merge "Prevent HDRLayerInfoListener traversal from running on every frame" into sc-dev