Commit graph

79856 commits

Author SHA1 Message Date
Rob Carr
abab27f7aa Merge "SurfaceFlinger: Send all BufferedLayers to InputFlinger" into rvc-dev am: e0d9770df1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11039839

Change-Id: I41084de651b5e46238be53cd73c3c25ad5d34d23
2020-06-09 16:13:55 +00:00
Rob Carr
e0d9770df1 Merge "SurfaceFlinger: Send all BufferedLayers to InputFlinger" into rvc-dev 2020-06-09 16:02:21 +00:00
TreeHugger Robot
fe84511f86 Merge "[SF] Don't crash if HWC returns an unknown config" into rvc-dev am: 9b89dd7a12
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11789968

Change-Id: I29225fb6f871bf2ec52ba7d51b8bfa52e61c9d04
2020-06-09 09:24:33 +00:00
TreeHugger Robot
9b89dd7a12 Merge "[SF] Don't crash if HWC returns an unknown config" into rvc-dev 2020-06-09 09:01:05 +00:00
Marin Shalamanov
533e8e2d53 [SF] Don't crash if HWC returns an unknown config
When we call getActiveConfig() after HWC updates its modes
and before notifying us, we'll get an unknown configuration.
This change fixes a null pointer dereference in this scenario.

Bug: 158481338
Test: m surfaceflinger && flash
Change-Id: Ifa812628d238e4eb7873a163c834abc9f380bb0a
2020-06-09 08:59:28 +00:00
TreeHugger Robot
10f26bb802 Merge "Remove FrameTracer from BLAST code" into rvc-dev am: 225533ea4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11797939

Change-Id: I7f0203889dcca455ccad9bedfe7f30c53dfc5f6e
2020-06-09 05:24:49 +00:00
TreeHugger Robot
225533ea4e Merge "Remove FrameTracer from BLAST code" into rvc-dev 2020-06-09 05:12:51 +00:00
Vishnu Nair
4225e7f1d5 Merge "Call Layer::getLayerDebugInfo from the main thread" into rvc-dev am: 32ca5feb99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11760023

Change-Id: Ia0d1652beeecc5d5c60e65fe9f4241b3f5b7a757
2020-06-08 21:36:10 +00:00
Vishnu Nair
32ca5feb99 Merge "Call Layer::getLayerDebugInfo from the main thread" into rvc-dev 2020-06-08 21:25:08 +00:00
Adithya Srinivasan
31c08d927d Remove FrameTracer from BLAST code
Since we are not focussing on BLAST for frame lifecycle, having to
support BLAST's frame lifecycle without proper understanding of the use
cases is going to be hard. This change removes the frame lifecycle code
from BLAST.

Bug: 158493222
Test: atest FrameTracerTest
Change-Id: Icb909fc836d5be214dade4991f582c76e5b2398d
2020-06-08 13:29:26 -07:00
Treehugger Robot
e047760ef5 [automerger skipped] Merge "TouchInputMapper: Use default viewport for PointerController" am: 69f1479abe am: 49990b462a -s ours
am skip reason: Change-Id Id73c59bce825855bc8c829c3a5a18c141593057e with SHA-1 a940fc6f0c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1319647

Change-Id: I689679bf7cc62853989334097227ce628af9e50b
2020-06-08 17:18:09 +00:00
Treehugger Robot
49990b462a Merge "TouchInputMapper: Use default viewport for PointerController" am: 69f1479abe
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1319647

Change-Id: I378e82dc2c6f1fe8506c7639f5c5244828589ea9
2020-06-08 17:02:28 +00:00
TreeHugger Robot
9d3db1d8ff Merge "[RESTRICT AUTOMERGE]gpuservice: always dump all in BugReport" into rvc-dev am: 607a0c6d5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11784422

Change-Id: I79af1c619fc2d31eda9b48a9454c5abe182f022f
2020-06-08 17:02:16 +00:00
Yiwei Zhang
01a05655c4 [RESTRICT AUTOMERGE]gpuservice: always dump all in BugReport am: 90153a1f6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11784422

Change-Id: I565d68f5d06ff1c0fe936f3135fde6b52e95461a
2020-06-08 17:02:14 +00:00
Treehugger Robot
69f1479abe Merge "TouchInputMapper: Use default viewport for PointerController" 2020-06-08 16:45:50 +00:00
TreeHugger Robot
607a0c6d5a Merge "[RESTRICT AUTOMERGE]gpuservice: always dump all in BugReport" into rvc-dev 2020-06-08 16:33:20 +00:00
Yo Chiang
79ee02db9a Merge "dumpstate: Fix required dependencies" am: 9a23df27d5 am: ddb4231578
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323972

Change-Id: Ic3d697e0c236e898d17881d16212a849fb236556
2020-06-08 16:20:47 +00:00
Jooyung Han
7303664482 Merge "Set min_sdk_version to be part of mainline modules" am: ee959e950b am: b78c851de4
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323982

Change-Id: Ifff8af337a075422e479c90af179856f8f2ac15a
2020-06-08 16:19:09 +00:00
Xin Li
f468094231 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e3e5b30b99 -s ours am: 1c4ff8137d -s ours
am skip reason: Change-Id Iea2c5fb12ea7b1ad563f540349063fcda557fbc1 with SHA-1 560de1587b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323615

Change-Id: I34d2b4f02849919710afb1f76e44393a32aae6d2
2020-06-08 16:08:01 +00:00
Yo Chiang
ddb4231578 Merge "dumpstate: Fix required dependencies" am: 9a23df27d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323972

Change-Id: I3f4e50d01ce5570fc9aff5a4501c12e686765f4a
2020-06-08 16:04:34 +00:00
Jooyung Han
b78c851de4 Merge "Set min_sdk_version to be part of mainline modules" am: ee959e950b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323982

Change-Id: I101977e743765e0ec8ec2bfeac51037fd4144944
2020-06-08 16:04:12 +00:00
Xin Li
1c4ff8137d [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e3e5b30b99 -s ours
am skip reason: Change-Id Iea2c5fb12ea7b1ad563f540349063fcda557fbc1 with SHA-1 560de1587b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323615

Change-Id: I6ad7aef5610ae30a68705047baeef51f2e21b477
2020-06-08 15:56:46 +00:00
Kevin DuBois
d61f23ec1e Merge "SF: avoid updating queue if schedule() is called." into rvc-dev am: 0bc7c5294b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11632515

Change-Id: I19c1a68994b9be193d020bf8e589cf8a80244bff
2020-06-08 15:14:18 +00:00
Kevin DuBois
0bc7c5294b Merge "SF: avoid updating queue if schedule() is called." into rvc-dev 2020-06-08 15:02:50 +00:00
Marin Shalamanov
13e6b16ddd Merge "[SF] Don't reset display state on reconnection" into rvc-dev am: 810a75538b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11710358

Change-Id: I43b8d12cb2e7c0b3c9ebda7d98ee5d5b1fa9489c
2020-06-08 14:05:22 +00:00
Marin Shalamanov
810a75538b Merge "[SF] Don't reset display state on reconnection" into rvc-dev 2020-06-08 13:54:22 +00:00
Yo Chiang
9a23df27d5 Merge "dumpstate: Fix required dependencies" 2020-06-08 07:41:04 +00:00
Jooyung Han
ee959e950b Merge "Set min_sdk_version to be part of mainline modules" 2020-06-08 06:56:41 +00:00
Yiwei Zhang
90153a1f6c [RESTRICT AUTOMERGE]gpuservice: always dump all in BugReport
Bug: 158386226
Test: take a bugreport and verify dumpsys gpu is not empty
Change-Id: Ib2827a72819ef3ccd3267144aaea2e5977f01745
2020-06-07 16:57:10 -07:00
Xin Li
e3e5b30b99 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:22 +00:00
Xin Li
2360c2a7c0 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1
Change-Id: Ie56daaaf7d1e9dfddf0dcd1adda00a3732671b0d
2020-06-05 15:17:42 -07:00
Vishnu Nair
43bccf8321 Call Layer::getLayerDebugInfo from the main thread
Fixes an issue where drawing state could be accessed from a binder
thread. The function also mixed current state with drawing state
incorrectly. The function now only retrieves drawing state.

Bug: 150226608
Test: Steps in bug doesn't repro
Test: atest sffakehwc_test
Change-Id: I5537c53e8214e2785473839d71fd483d1a3219b6
2020-06-05 12:06:05 -07:00
Kevin DuBois
5c18c1cf64 SF: avoid updating queue if schedule() is called.
Avoids a rarish race condition where a callback is scheduled in the
interim time between the TimerDispatch starting to run and the callback
for that scheduled callback is invoked. In this condition, the code will
now have the next callback pend until the timer queue processes the when
to wakeup next.

Bug: 154303580
Test: 3 new unit tests
Test: boot to home, check some animations
Test: overnight dogfood with patch.

Change-Id: I0e7e2e3698ed6d1765082db20d9cf25f6e6c2db2
2020-06-05 07:50:52 -07:00
Jooyung Han
2cf9404386 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I6818cdedfca4a3c8bd503b880db9240de7be757d
2020-06-05 17:32:57 +09:00
JW Wang
26c8c343bf [automerger skipped] Merge "Delete APK snapshots during restoration (3/n)" into rvc-dev am: 5bcc8f8a38 -s ours
am skip reason: Change-Id I5a7540aa08922c4b0c617c9cb37e1bec2ff23fc1 with SHA-1 fda19ecdd6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11644366

Change-Id: Id6646530b574910f8cc28f35eca56efe4ba1f815
2020-06-05 01:55:51 +00:00
JW Wang
5bcc8f8a38 Merge "Delete APK snapshots during restoration (3/n)" into rvc-dev 2020-06-05 01:29:08 +00:00
Nick Cook
7a7321260b docs: Fix ref doc links. See generated output in cl/314618386.
Bug: 148938276
Test: m ndk
Change-Id: I7374793e72e1f836c2ba1eeeebe09ccdcf58ce4b
2020-06-04 23:09:09 +00:00
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
TreeHugger Robot
a8d1de82db Merge "Fix issue where surface corner rounding is ignored" into rvc-dev 2020-06-04 21:51:09 +00:00
Muhammad Hasan Khan
4d0589a04f Merge "arc: Implement smaller dumpstate output" into rvc-dev am: 501178aac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11550006

Change-Id: I84847455c488743b1b660786fdb901ad8a3946eb
2020-06-04 19:53:05 +00:00
Marin Shalamanov
4c5e301006 [SF] Don't reset display state on reconnection
Currently we reset the display state when hotplug reconnect
is received for an already connected display. This is not
correct, instead the state has to be updated by DisplayManager.

This fixes a bug when config_maxUiWidth is set in frameworks/
base. In this case the framework sets the display viewport to
match the limited layer stack size but this setting is lost
after a hotplug.

Bug: 157549449
Test: build, flash, plug out and in the display, make sure the
          picture is still properly displayed
Change-Id: If8536963a4b912a6ff7d41a0fe54181cae35cc65
2020-06-04 21:44:37 +02:00
Muhammad Hasan Khan
501178aac0 Merge "arc: Implement smaller dumpstate output" into rvc-dev 2020-06-04 19:39:41 +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
Yifan Hong
7d95d1331f Merge "Revert "servicemanager: hard failure for missing context"" am: 060a736711 am: 0d2c95a711
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1322621

Change-Id: I8fc78285bcd58a06a0c8387ec4f39ea81e375bbf
2020-06-04 18:30:03 +00:00
Yifan Hong
0d2c95a711 Merge "Revert "servicemanager: hard failure for missing context"" am: 060a736711
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1322621

Change-Id: I94fb1123cbc4e9aaf1c5d0297ea0a7f6e6665cd6
2020-06-04 18:17:19 +00:00
Yifan Hong
060a736711 Merge "Revert "servicemanager: hard failure for missing context"" 2020-06-04 18:02:07 +00:00
Yo Chiang
1151baf223 dumpstate: Fix required dependencies
TARGET module dumpstate requires non-existent: df
TARGET module dumpstate requires non-existent: getprop
TARGET module dumpstate requires non-existent: ip6tables
TARGET module dumpstate requires non-existent: kill
TARGET module dumpstate requires non-existent: lsmod
TARGET module dumpstate requires non-existent: lsof
TARGET module dumpstate requires non-existent: netstat
TARGET module dumpstate requires non-existent: printenv
TARGET module dumpstate requires non-existent: top
TARGET module dumpstate requires non-existent: uptime
TARGET module dumpstate requires non-existent: vril-dump

df, kill, lsmod, lsof, netstat, printenv, top, uptime are symlinks of toybox.
getprop is symlink of toolbox.
ip6tables is symlink of iptables.
vril-dump doesn't exist.

Bug: 7456955
Test: TH noop
Change-Id: I3a8b07778ae1042a51e1d5c1f0de06a55d01319d
2020-06-04 17:12:34 +08:00
Rhed Jao
864275956b Merge "Sorts the vector of files by the mtimes" into rvc-dev am: e1b7671b90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11716719

Change-Id: Id2ab02030576a559c3eb55e7158c876ca3267d43
2020-06-04 02:48:35 +00:00
Rhed Jao
e1b7671b90 Merge "Sorts the vector of files by the mtimes" into rvc-dev 2020-06-04 02:29:00 +00:00
Elliott Hughes
8526cb7288 Merge "API level 30 cleanup." into rvc-dev-plus-aosp 2020-06-03 21:27:30 +00:00