Commit graph

8374 commits

Author SHA1 Message Date
TreeHugger Robot
61022ca090 Merge "Fix issue where surface corner rounding is ignored" into rvc-dev am: a8d1de82db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11728465

Change-Id: Ie7fb410bbf14cca0584fdd5afba4a6640763e6a5
2020-06-04 22:06:12 +00:00
Lucas Dupin
eab7ea0e64 Fix issue where surface corner rounding is ignored
It's not correct to only check the diagonal of the transform matrix
for scaling. The scale will be distributed across four components
when the layer is rotated.

Test: manual
Test: atest LayerTypeAndRenderTypeTransaction
Fixes: 147415720
Change-Id: I140b373efd7fad705d0cd54aa6e86b4142e190e5
2020-06-04 11:47:34 -07:00
Robert Carr
5d3cf52a4d DO NOT MERGE: SurfaceFlinger: Don't wake for pending transactions. am: 7ec777d945
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11659377

Change-Id: If6b3b4cbf992b939bdc4bf8d683aa271e3600280
2020-06-02 20:37:53 +00:00
Rob Carr
c43da98656 Merge "DO NOT MERGE: SurfaceFlinger: Don't wake for pending transactions." into rvc-dev 2020-06-02 20:21:05 +00:00
TreeHugger Robot
34122992bf Merge "Stop requantizing complex derived sensors" into rvc-dev am: ab63fa0eb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11707400

Change-Id: Ie673d3e4bf811f7bdf90b2100bf670d5315f5572
2020-06-02 19:27:17 +00:00
TreeHugger Robot
ab63fa0eb5 Merge "Stop requantizing complex derived sensors" into rvc-dev 2020-06-02 19:09:51 +00:00
Anthony Stange
5dc55cac38 Stop requantizing complex derived sensors
Sensors that derive their output from physical sensors and effectively
apply an irreversible filter onto their data. Requantizing this
information has little benefit and can potentially increase floating
point inaccuracy due to the additional math.

Bug: 157986376
Test: presubmits
Change-Id: I4158739abb6b74d978abe75bd8e03ac32ad4e998
2020-06-02 13:56:35 -04:00
TreeHugger Robot
365ec5617a Merge "SF: Reconfirm all period changes, ignore HWC" into rvc-dev am: 19e96d089f
Original change: undetermined

Change-Id: I1f2564e2676d322f1d50d6299a294479b376956f
2020-06-02 17:33:51 +00:00
TreeHugger Robot
19e96d089f Merge "SF: Reconfirm all period changes, ignore HWC" into rvc-dev 2020-06-02 17:24:24 +00:00
TreeHugger Robot
4952dd4137 Merge "Fix logical error in UID idle/active handling" into rvc-dev am: c8f7d50cd0
Original change: undetermined

Change-Id: I899ebe4b0cfde400c3163e27cbd9d0a2b52aeb7d
2020-06-02 14:47:01 +00:00
TreeHugger Robot
c8f7d50cd0 Merge "Fix logical error in UID idle/active handling" into rvc-dev 2020-06-02 14:31:58 +00:00
TreeHugger Robot
2108289c37 Merge "SurfaceFlinger: record layer history for TX with eAnimation" into rvc-dev am: d9f4f88929
Original change: undetermined

Change-Id: If875bc8662102132d3284134c7f4b8a5074359b9
2020-06-02 03:35:07 +00:00
TreeHugger Robot
d9f4f88929 Merge "SurfaceFlinger: record layer history for TX with eAnimation" into rvc-dev 2020-06-02 03:20:45 +00:00
TreeHugger Robot
38c446365b Merge "Add layer flag to allow creating an effect layer without color fill" into rvc-dev am: 3c62656e42
Original change: undetermined

Change-Id: Ibc04d4e8a4221eecf53de803222bae4eb81ff95d
2020-06-01 23:55:49 +00:00
TreeHugger Robot
3c62656e42 Merge "Add layer flag to allow creating an effect layer without color fill" into rvc-dev 2020-06-01 23:41:12 +00:00
Arthur Ishiguro
3cc2c3593d Fix logical error in UID idle/active handling
There is a bug where the sensor is not properly deactivated
when ann app becomes idle. This CL fixes the issue, and also
avoids calling batch() if no active clients exist.

Bug: 157934995
Test: Flash, verify sensor is disabled when app goes idle
and re-enabled when app becomes active again

Change-Id: I403b02a20dc89c5ce0630de6ddfd6242bf38ec37
2020-06-01 16:23:40 -07:00
Lucas Dupin
e0e480c2d8 Merge "Do not accept blur transaction when disabled" into rvc-dev am: b31d3c81e9
Original change: undetermined

Change-Id: Id7e4e1cf741efa6cb88855ebb2ee1d866df8ee73
2020-06-01 21:48:09 +00:00
Lucas Dupin
b31d3c81e9 Merge "Do not accept blur transaction when disabled" into rvc-dev 2020-06-01 21:14:14 +00:00
Lucas Dupin
130e55ca93 Do not accept blur transaction when disabled
Bug: 155420902
Test: forrest
Change-Id: I5f0437f28c25465091cec4cb78e8f5c55bc94f0e
2020-06-01 21:14:00 +00:00
Dan Stoza
027d365531 SF: Reconfirm all period changes, ignore HWC
This change includes two separate fixes to make waking up from idle more
robust when using a kernel idle timer:

  1) Always reconfirm the refresh rate when we resync to hardware vsync.
     This is because if the kernel idle timer is enabled, we may not
     immediately be in the refresh rate we expect to be.
  2) Ignore the refresh rate reported by the hardware vsync callbacks,
     since that refresh rate may not reflect the actual refresh rate
     when the kernel idle timer is in effect.

Bug: 154303580
Test: systrace
Test: libsurfaceflinger_unittest
Change-Id: I79c66faeaed262acd9c5925fe2202a9fb3f10b7b
2020-06-01 13:54:50 -07:00
TreeHugger Robot
cc2a82e6c0 Merge "Add basic ANR test" into rvc-dev am: 0979ea52c1
Change-Id: I790b02e0012bdc4496de464176a745339a08eb5f
2020-06-01 20:14:11 +00:00
TreeHugger Robot
0979ea52c1 Merge "Add basic ANR test" into rvc-dev 2020-06-01 19:59:54 +00:00
Robert Carr
7ec777d945 DO NOT MERGE: SurfaceFlinger: Don't wake for pending transactions.
When we still have pending transactions (e.g. we are waiting on the
other side of a deferred transaction), we need to set the transaction
flags on SurfaceFlinger, so SurfaceFlinger will continue to call
doTransaction and give us a chance to process them. However when
we set the transaction flags, we trigger a wake up! This isn't
desirable, as the frame might have not come in. If the frame did come
in we will get to INVALIDATE, and from INVALIDATE observe the
transaction flags. This means we can set the transaction flags without
scheduling a wakeup and rely on the incoming frame to eventually wake
us up. I also considered triggering the transaction processing from
onFrameAvailable but at that point we are too late in the composition
cycle.

Bug: 157685525
Test: Existing tests pass
Change-Id: Ia54bc9f48a80906fc8f21c46debc72fabadd3e07
2020-06-01 18:44:05 +00:00
Ady Abraham
5def733be3 SurfaceFlinger: record layer history for TX with eAnimation
If a transaction is posted with ISurfaceComposer::eAnimation flag,
record it with layer history. Layers with eAnimation are considered
animating and will vote for peak refresh rate.

Bug: 157695685
Test: Play 24fps video in YouTube PIP mode with setFrameRate and rotate the device - no jank
Test: Chrome playing video - no refresh rate switching
Test: Hide/Show keyboard when inputting text
Test: Running Hay Day and observing refresh rate
Change-Id: If62e11b395c44d9e5fd40b74864fefd068953413
2020-06-01 11:20:23 -07:00
Siarhei Vishniakou
ffaa2b1630 Add basic ANR test
To reduce the delta of the upcoming ANR refactor, add a basic ANR test
here. This will also help highlight the difference in behaviour from the
current code to the new code.

To cause an ANR today, the socket needs to be blocked, which means that
we need to send ~ 50 events to the unresponsive window.

These workarounds will be removed when the ANRs are refactored.

Bug: 143459140
Test: adb shell -t /data/nativetest64/inputflinger_tests/inputflinger_tests --gtest_filter="*InputDispatcherSingleWindowAnr*" --gtest_repeat=1000
--gtest_break_on_failure

Change-Id: I0a1b28c2785d03d8870691641e0f7c6b1ca3b85e
Merged-In: I0a1b28c2785d03d8870691641e0f7c6b1ca3b85e
2020-06-01 09:56:09 -07:00
Orion Hodson
499ad88989 Merge "Add dependencies on jni_headers" am: ed38697b9f am: 560de1587b
Change-Id: Idf1fc1cab46e19b6a38350323c53fe7acd7bd91f
2020-06-01 09:58:43 +00:00
Orion Hodson
560de1587b Merge "Add dependencies on jni_headers" am: ed38697b9f
Change-Id: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1
2020-06-01 09:39:13 +00:00
Orion Hodson
ed38697b9f Merge "Add dependencies on jni_headers" 2020-06-01 09:20:10 +00:00
Ady Abraham
34cea217d5 SurfaceFlinger: keep layer history for inactive layers am: 983e568b3c
Change-Id: I0a89efdbae8c48d5aca6149aee8d1876e9d7c550
2020-05-30 01:16:01 +00:00
Ady Abraham
983e568b3c SurfaceFlinger: keep layer history for inactive layers
The current implementation of layer history discards all the history
if a layer is considered inactive. This leads to an issue in the scenario
that a layer is posting infrequent updates so slow, that by the time we
get the next buffer, the layer is considered inactive, and we bump the
refresh rate to Max, instead of detecting that layer as infrequent.

As a fix, we keep around the layer history even if it is inactive.
To avoid cases where detect animations too late, we clear the history
on touch event.

Bug: 156654519
Test: add a new unit test that simulates the buffer pattern
of a Netflix playback

Change-Id: Ie076891806d74dde814fbbb3b1a73c38e0b2ae34
2020-05-29 16:22:50 -07:00
Treehugger Robot
036b105b6e Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" am: 43beafe0b0
Change-Id: Ib3930377b494bf7bafce339165dff428a30563b6
2020-05-29 21:57:19 +00:00
Vishnu Nair
c43a23c149 Add layer flag to allow creating an effect layer without color fill
This change allows creating an effect layers without a color fill so
we can avoid an additional sf transactions when creating effect
layers.

Fixes: 157646690
Test: go/wm-smoke
Test: atest SurfaceFlinger_test
Change-Id: I3d8a4f4820d7b8fb05daab697c25cff8def612c1
2020-05-29 14:38:30 -07:00
Ady Abraham
7826b077fc Merge changes from topic "sf_157096772" into rvc-dev am: b74fe1dc23
Change-Id: Idee6fb1dd148987fd37bfeff0dd0497646cf38ad
2020-05-29 03:59:00 +00:00
Ady Abraham
b74fe1dc23 Merge changes from topic "sf_157096772" into rvc-dev
* changes:
  SurfaceFlinger: clear LayerHistory on first touch
  Revert "SurfaceFlinger: more aggressive infrequent layer detection"
  Revert "SurfaceFlinger: tune MAX_FREQUENT_LAYER_PERIOD_NS for inactive layers"
  Revert "SurfaceFlinger: tune infrequent detection logic more"
2020-05-29 03:45:06 +00:00
TreeHugger Robot
74fc4aef8b Merge "Process focus events first" into rvc-dev am: 0b257105a2
Change-Id: I29926515404057126805eb7326615a9e5a907da0
2020-05-28 23:36:58 +00:00
TreeHugger Robot
0b257105a2 Merge "Process focus events first" into rvc-dev 2020-05-28 22:28:05 +00:00
Siarhei Vishniakou
de1bc4a4e3 Process focus events first
While refactoring ANR logic, we discovered that an existing Q behaviour
was broken by the focus refactoring. The behaviour aims to prevent keys
from being sent to incorrect windows.

The desired behaviour is as follows: if there are any unfinished events,
then do not process key events (keep them pending), which would allow
these key events to go to a new window, if one becomes focused. The
intent is that if the user hits "Alt+Tab" to switch to another window,
and starts typing right away, we want to make sure that we have
processed the focus event for the new window prior to determining where
to send the new key events after Alt+Tab.

The behaviour is broken today because we put the focus events at the
back of the queue. So even if we process the focus event first, it would
still go to the app after the key event, which would mean that the new
window may receive it, but would drop it because that window does not
yet have focus (since we haven't sent the focused event to it).

The proposed solution is to always put the focus events in the front of
the queue. But, we still need to preserve the relative order of focus
events. To account for that, we put a new focus event always at the
front of the queue, but behind any other focus events that may be there.

Bug: 143459140
Test: added in ANR CL because this behaviour is updated there.
Change-Id: I95256bd3f57988d1990cf1f21267c8f405892e8e
Merged-In: I95256bd3f57988d1990cf1f21267c8f405892e8e
2020-05-28 14:05:17 -07:00
Garfield Tan
0a080c3666 Let InputReader set mouse cursor's display.
InputReader was already responsible to bind device/event and display. It
makes sense to further extend it to control the display where mouse
cursor is shown.

Bug: 146385350
Test: Mouse cursor shows up at expected display.
Test: atest inputflinger_tests
Change-Id: Ie7a9546550b70c8834462b06de929472196fe713
Merged-In: Ie7a9546550b70c8834462b06de929472196fe713
2020-05-28 12:01:35 -07:00
Ady Abraham
a6b676e33a SurfaceFlinger: clear LayerHistory on first touch
- Restructure the code in RefreshRateConfigs to be able to clear
   LayerHistory frames on the first touch event. Without this change we
   clear the history on every frame as long as the touch timer hasn't
   expired.
 - Add log prints for debugging

Test: Play 24fps video in YouTube PIP mode and rotate the device - no jank
Test: Chrome playing video - no refresh rate switching
Test: Hide/Show keyboard when inputting text
Test: Running Hay Day and observing refresh rate
Bug: 157096772
Change-Id: I7cabecd6ea27ec335e773aa22bb111fa8ec89195
2020-05-28 18:48:29 +00:00
Ady Abraham
dfb63ba78b Revert "SurfaceFlinger: more aggressive infrequent layer detection"
This reverts commit 1adbb72759.

Reason for revert: Causing regression with b/157096772

Change-Id: Ib2009f7a4ecbd268ea69304853a91bd22674ec1e
Test: Play 24fps video in YouTube PIP mode and rotate the device - no jank
Test: Chrome playing video - no refresh rate switching
Test: Hide/Show keyboard when inputting text
Test: Running Hay Day and observing refresh rate
Bug: 157096772
Bug: 155062712
Bug: 156654519
2020-05-28 18:48:22 +00:00
Ady Abraham
f5bc779caa Revert "SurfaceFlinger: tune MAX_FREQUENT_LAYER_PERIOD_NS for inactive layers"
This reverts commit eeb74561b6.

Reason for revert: Causing regression with b/157096772

Change-Id: I031219588cedf5cfcb75255430f707428ed59f72
Test: Play 24fps video in YouTube PIP mode and rotate the device - no jank
Test: Chrome playing video - no refresh rate switching
Test: Hide/Show keyboard when inputting text
Test: Running Hay Day and observing refresh rate
Bug: 157096772
Bug: 157110371
2020-05-28 18:42:59 +00:00
Ady Abraham
af6d8a4142 Revert "SurfaceFlinger: tune infrequent detection logic more"
This reverts commit 39db2c9b07.

Reason for revert: Causing regression with b/157096772

Change-Id: I058d6f8efa637cb36371276761281f51b7aa3dd3
Test: Play 24fps video in YouTube PIP mode and rotate the device - no jank
Test: Chrome playing video - no refresh rate switching
Test: Hide/Show keyboard when inputting text
Test: Running Hay Day and observing refresh rate
Bug: 157096772
2020-05-28 18:41:02 +00:00
Chavi Weingarten
a026ce7096 Merge "Hold mMutex lock and check abandoned when accessing mLayer" into rvc-dev am: a38a3e145a
Change-Id: Ib2b021000383a2156e9d6962fac91058944449c8
2020-05-28 00:25:26 +00:00
Chavi Weingarten
a38a3e145a Merge "Hold mMutex lock and check abandoned when accessing mLayer" into rvc-dev 2020-05-28 00:16:11 +00:00
TreeHugger Robot
15a6c10cb2 Merge "Plumb client target property." into rvc-dev am: ac17aa0a0f
Change-Id: I60e9bed296ff2fc1890be027e4da5e325a5b890a
2020-05-27 23:43:47 +00:00
TreeHugger Robot
ac17aa0a0f Merge "Plumb client target property." into rvc-dev 2020-05-27 23:28:52 +00:00
chaviw
1a4dba4b2b Hold mMutex lock and check abandoned when accessing mLayer
The Layer lifecycle is tied to BufferLayerConsumer so when the Layer is
removed, the BufferLayerConsumer is abandoned. However, abandoned
doesn't necessarily mean it was cleaned up yet. Therefore, we need to
check whether the BufferLayerConsumer was abandoned before accessing the
raw pointer mLayer. If the BufferLayerConsumer was not abandoned, then
mLayer will be valid.

Test: Builds and runs. Hard to reproduce race condition
Fixes: 157535966
Fixes: 155679049
Change-Id: I8b309c9e1fe57746bceabab1deda56248087b189
2020-05-27 15:16:15 -07:00
Alec Mouri
33f2fd9c57 Merge "Lock display refresh rate when primary range is a single rate." into rvc-dev am: a9e0d8a9e3
Change-Id: Ia7e254a4b9af6773eae790ee92dabc54d8df1c09
2020-05-27 22:11:41 +00:00
Alec Mouri
a9e0d8a9e3 Merge "Lock display refresh rate when primary range is a single rate." into rvc-dev 2020-05-27 21:55:30 +00:00
Orion Hodson
a58ef3567b Add dependencies on jni_headers
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: m checkbuild
Change-Id: I06873e61e519b6e54d7325f90231bce732790366
Merged-In: I06873e61e519b6e54d7325f90231bce732790366
Exempt-From-Owner-Approval: build clean-up
(cherry picked from commit e32877afcc)
2020-05-27 16:52:08 +01:00