summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-08Snap for 8426163 from 8c838655316b24ee30515cdffb13ead5a67aa83c to ↵android-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100Android Build Coastguard Worker
mainline-tzdata2-release Change-Id: I3f24fd1f52757411f691188c361389cd2216b5be
2021-11-10[automerger skipped] Check if the window is partially obscured for slippery ↵Siarhei Vishniakou
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
2021-11-10[automerger skipped] Check if the window is partially obscured for slippery ↵Siarhei Vishniakou
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
2021-11-10Check if the window is partially obscured for slippery enters am: 6e689ffe3f ↵Siarhei Vishniakou
am: 224d576c0b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16185286 Change-Id: I49fb56b83a8799ac6a380b269bca06adc5289aba
2021-11-10Check if the window is partially obscured for slippery enters am: 6e689ffe3fSiarhei Vishniakou
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16185286 Change-Id: I6645db77a493d55aacc8f645db625ea5f89a8d36
2021-11-10Merge "Check if the window is partially obscured for slippery enters" into ↵TreeHugger Robot
rvc-dev am: b27497c4bf Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16194632 Change-Id: I597107cf0a85b6dbc73dcc4092d3c077d678e661
2021-11-09Merge "Check if the window is partially obscured for slippery enters" into ↵TreeHugger Robot
rvc-dev
2021-11-09Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87e3Winson Chung
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15975349 Change-Id: I82ff44bf8945c25f93934ce0d66a9d6df79c39c0
2021-11-09DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructor ↵Robin Lee
am: 41f48c7b10 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15975349 Change-Id: I0912c6d109ad74b0525cc5505a77177ed1f96e4a
2021-11-09Add mechanism for a task's windows to be trusted overlays (SF) am: 7605fb4273Winson Chung
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15975348 Change-Id: I4058c131ac922d0a13482465c08dab0f94d3cab1
2021-11-09Change InputWindowInfo::isTrustedOverlay() to be permission and flag based. ↵Chris Ye
am: 39bc6117dd Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15975347 Change-Id: I16c075529730d5d7aab08fa0779dac436aa956e4
2021-11-09avoid extra release of unowned objects in Parcel error path am: d668098e47Steven Moreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16177016 Change-Id: I339bd999acca04d1a5252a1d3237200a1bbf0088
2021-11-09Merge changes from topic "trusted_overlay_backport" into rvc-devWinson Chung
* 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.
2021-11-09Check if the window is partially obscured for slippery entersSiarhei Vishniakou
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
2021-11-05DO NOT MERGE Initialize DrawingState::trustedOverlay to false in constructorRobin Lee
To avoid it being initialised to true randomly. Bug: 199483370 Bug: 196389741 Change-Id: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa Merged-In: I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa
2021-11-05Add mechanism for a task's windows to be trusted overlays (SF)Winson Chung
- 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
2021-11-05Change InputWindowInfo::isTrustedOverlay() to be permission and flag based.Chris Ye
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
2021-11-04Check if the window is partially obscured for slippery entersSiarhei Vishniakou
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)
2021-11-02avoid extra release of unowned objects in Parcel error pathSteven Moreland
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)
2021-10-07Snap for 7803083 from 38afbfd13622e10b8e74b9c114fa05f30ba480bb to ↵Android Build Coastguard Worker
mainline-tzdata2-release Change-Id: Ic05c46aa04f9072b3dc93e023a17408956f14474
2021-09-09Surface: Release references to BlastBufferQueue and SurfaceControl on ↵Vishnu Nair
Surface#destroy am: fe4d05cd44 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15787430 Change-Id: I90d63e606bb73b24b81b676fc38847cae1b697a8
2021-09-08Surface: Release references to BlastBufferQueue and SurfaceControl on ↵Vishnu Nair
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
2021-09-07[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b ↵Steven Moreland
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: I975a40b925639f24ac13f697f01beea026f7ddb1
2021-09-07[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b ↵Steven Moreland
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
2021-09-07[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b ↵Steven Moreland
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: I5f56b6aa9d793a935685cb9c390166094dad8603
2021-09-07[automerger skipped] libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b ↵Steven Moreland
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
2021-09-07libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b am: 17aa765fd3 am: ↵Steven Moreland
d666af6990 am: 62eaabc324 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15759163 Change-Id: I53b504bbb6299988939674ba2b21344569c0da6d
2021-09-07libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b am: 17aa765fd3 am: ↵Steven Moreland
d666af6990 am: 62eaabc324 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15759163 Change-Id: Ie9e50a46e486fecafac61d66b79095687d671a3f
2021-09-03libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b am: 17aa765fd3 am: ↵Steven Moreland
d666af6990 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15720346 Bug: 197336441 Change-Id: I703760ecbfa007d27caf76556ed21bbf0558df80
2021-09-03libbinder: uptimeMillis returns int64_t! am: 3ba4963f5b am: 17aa765fd3Steven Moreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15720346 Change-Id: I51d7e7341d8af4788dbc224b7ab22129c235aa52
2021-09-03libbinder: uptimeMillis returns int64_t! am: 3ba4963f5bSteven Moreland
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15720346 Change-Id: Ic08346b606933f364a2dbdad7a09c97b9ef059e7
2021-08-30libbinder: uptimeMillis returns int64_t!Steven Moreland
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
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵Xin Li
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: Ifa744e0b375e20194f82c0573e859575a15cf25b
2021-08-13Merge stage-aosp-sc-ts-dev before making it an upstreamXin Li
Bug: 169893837 Merged-In: I2a2d02a0d7e67ee9577857a210cb6157683e5598 Change-Id: I0c4b099b959d66900eebc2624c85e000a84e9c54
2021-08-12Merge ab/7633965The Android Open Source Project
Bug: 169893837 Merged-In: I2a2d02a0d7e67ee9577857a210cb6157683e5598 Change-Id: Iecdf0a17afe650483461978b42161940ce002101
2021-08-06Merge "Blast: Fix missing release callbacks for shared buffers" into sc-dev ↵Vishnu Nair
am: 810d19378e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15476911 Change-Id: Ie2c273e9b0162070d692ada54f5430306268fa46
2021-08-06Merge "Blast: Fix missing release callbacks for shared buffers" into sc-devandroid12-devVishnu Nair
2021-08-06Merge "SF: fix frame rate for layer tree" into sc-dev am: 3871daf53aAdy Abraham
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15463251 Change-Id: I6ca652e01fcefe9d4414147e4908d3f92f6d3a54
2021-08-06Merge "SF: fix frame rate for layer tree" into sc-devAdy Abraham
2021-08-05Blast: Fix missing release callbacks for shared buffersVishnu Nair
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
2021-08-05SF: fix frame rate for layer treeAdy Abraham
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
2021-08-05sensorservice: ProximitySensor needs to report correct sensor state. am: ↵Chris Kuiper
cebf2e6cd6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15459770 Change-Id: I9de490bffcc00106e6b683d2028ee5a6f6e2d1a2
2021-08-05sensorservice: Fix SensorDevice::isSensorActive(). am: c63880a5a9Chris Kuiper
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15463254 Change-Id: I92f144eecb30b7eeb513c9ac204be650e21d6b6f
2021-08-04sensorservice: ProximitySensor needs to report correct sensor state.Chris Kuiper
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
2021-08-04sensorservice: Fix SensorDevice::isSensorActive().Chris Kuiper
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
2021-08-02Merge "SurfaceView: Synchronize destframe updates with SurfaceView size ↵Vishnu Nair
changes" into sc-dev am: edec715c76 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15363852 Change-Id: If77029f7df94092da9ff01972dfec8ed8fa6c7db
2021-08-02Merge "SurfaceView: Synchronize destframe updates with SurfaceView size ↵Vishnu Nair
changes" into sc-dev
2021-07-30SurfaceView: Synchronize destframe updates with SurfaceView size changesVishnu Nair
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
2021-07-29Merge "Don't call invalidateHwcGeometry when handling transactions" into ↵Rob Carr
sc-dev am: addd383230 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15404307 Change-Id: I4d4f2f42013b538e84f87c9e86d1417852fee376
2021-07-29Merge "Prevent HDRLayerInfoListener traversal from running on every frame" ↵Rob Carr
into sc-dev am: f6e2ea73ad Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15412093 Change-Id: Ibf1f802a7bd9565b0b1570dc44300e0301e58552
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 13:14:42 +0000