10497 Commits

Author SHA1 Message Date
Yao Chen
0ed3477b55 Merge "Remove encryption from incidentd" into qt-dev am: a8a18f6d32
am: dfeb6834aa

Change-Id: I041af24ac2c733cbf81eaf7fa0a573ab5ed4bf72
2019-05-08 15:55:04 -07:00
Haibo Huang
419b7ab1f6 Merge "Update to follow the new google benchmark API" am: d22ba181d0 am: bbd62aff7a
am: 3a385294bf

Change-Id: I4b71a307f113454f373fff41bae13bc9ab96e7c0
2019-05-08 15:43:25 -07:00
Yao Chen
dfeb6834aa Merge "Remove encryption from incidentd" into qt-dev
am: a8a18f6d32

Change-Id: I242cb112a32a813d60d8864ee5a6ff684a9989d8
2019-05-08 15:11:47 -07:00
Haibo Huang
3a385294bf Merge "Update to follow the new google benchmark API" am: d22ba181d0
am: bbd62aff7a

Change-Id: I49539681a3220a9e986602fd5652998c462fd6cc
2019-05-08 15:04:35 -07:00
Haibo Huang
bbd62aff7a Merge "Update to follow the new google benchmark API"
am: d22ba181d0

Change-Id: Ie5065ff193bfe187683e729d589138c24f4f2fac
2019-05-08 14:48:57 -07:00
Yao Chen
a8a18f6d32 Merge "Remove encryption from incidentd" into qt-dev 2019-05-08 21:31:04 +00:00
Elliott Hughes
7a6cc0c006 Track libziparchive API change.
Bug: http://b/129068177
Test: treehugger
Change-Id: Id4b202502b07e08102deda49f7d28ba10a63bb0a
2019-05-08 12:29:25 -07:00
Haibo Huang
5eb2e96898 Update to follow the new google benchmark API
Test: build
Change-Id: Icc25b81e9b863c35c02c9673518fa4d30e9ae321
2019-05-08 18:29:01 +00:00
Elliott Hughes
646d65cd48 Merge "Merge "Track libziparchive API change." am: 32581e1dd2 am: 78791cd8d7" into qt-dev-plus-aosp
am: 40358393fa

Change-Id: I02d8f5a7c8a4e255927e751591354415954c83a7
2019-05-06 19:50:38 -07:00
Elliott Hughes
dfe3d688fc Merge "Track libziparchive API change." am: 32581e1dd2
am: 78791cd8d7

Change-Id: Id4ac5019e267fbd0a32a41437e92c3f802e334e8
2019-05-06 17:45:35 -07:00
Elliott Hughes
78791cd8d7 Merge "Track libziparchive API change."
am: 32581e1dd2

Change-Id: I498a0197bb6aab88217a4c796fd5bed7c1802e33
2019-05-06 17:18:37 -07:00
Elliott Hughes
b97e737c18 Track libziparchive API change.
Bug: http://b/129068177
Test: treehugger
Change-Id: I88f49a06db416a7c6ec8afe87cc9cca825eb5ccb
2019-05-03 22:42:31 -07:00
John Reck
a5883972cd Merge "Be quiet" into qt-dev am: 6297eced24
am: 585a504528

Change-Id: Ia71f5a64b70a63bca800a24c8119ff3f82d8acdd
2019-05-03 15:05:39 -07:00
John Reck
585a504528 Merge "Be quiet" into qt-dev
am: 6297eced24

Change-Id: I7891af97193daf87e6537eaf316ec95edfbf5261
2019-05-03 10:45:49 -07:00
John Reck
4b5e5551ba Be quiet
Fixes: 131863240
Test: logcat
Change-Id: I0276082b949f9521a804a4c1ef8af2148b69621b
2019-05-02 17:10:46 -07:00
Derek Sollenberger
ac33a48751 Fix fading edge effect from impacting neighboring pixels
Bug: 129117085
Test: skia unit tests and test cases described in the bug
Change-Id: Ieaa7c831dd6298ac0565e6f1837b1c1dbd4545da
2019-05-02 13:04:20 -04:00
TreeHugger Robot
5a18ca3ee0 Merge "don't use legacy postTranslate255" 2019-05-02 13:48:55 +00:00
TreeHugger Robot
c45aff9799 Merge "Interpret linearMetrics flag to imply no-hinting." 2019-05-02 02:44:47 +00:00
Mike Reed
c9b5a97271 don't use legacy postTranslate255
Test: make

Change-Id: I040dffb99d540e8c6989a2bb1b5bcb70cc1a257e
2019-05-01 15:53:40 -04:00
Ben Wagner
ea3cbd0997 Interpret linearMetrics flag to imply no-hinting.
When drawing text and the linearMetrics flag is set, interpret it as a
'linear' flag which implies no-hinting. This will keep existing behavior
and match how the flag is currently documented when Skia changes the
behavior to be seperable from hinting.

Test: Strict improvement, broken tests will be fixed before landing.
Change-Id: Ie76f84e4fd23f4086a2f955b37d3be140452e77f
2019-05-01 13:17:20 -04:00
TreeHugger Robot
fa5180edff Merge "use new non-255 colormatrix" 2019-05-01 13:11:43 +00:00
Joe Onorato
4549c56da5 Merge "Merge changes I342cd7d0,I2c55831b into qt-dev am: a58591179b" into qt-dev-plus-aosp
am: 431d180650

Change-Id: Iced3cb988011310417483fa21d71913fd33362f5
2019-04-30 16:05:06 -07:00
Joe Onorato
e3b19fcf3a Merge changes I342cd7d0,I2c55831b into qt-dev
am: a58591179b

Change-Id: I0ba72b338102a3ef4ebbdef5ac37517ccc91ddc2
2019-04-30 12:50:11 -07:00
Yao Chen
a51f3fa6fe Remove encryption from incidentd
Test: build
Bug: 131371777

Change-Id: I412c73658025246004412f3bcdcf30f74d766326
2019-04-30 11:51:24 -07:00
Yiwei Zhang
74aa081b36 Merge "Zygote: add a way to preload Vulkan driver" into qt-dev am: 862a21c977
am: 73bbed320a

Change-Id: I3b1cddb15e0d15147dec6ff47643193e61e6b108
2019-04-29 21:31:57 -07:00
John Reck
f218b1a384 Merge "Fix some force_dark prop behaviors" into qt-dev am: 8538ceba82
am: 6d6c5c861b

Change-Id: I2fc6b65ab7ec4ab1af738f2770b2e7edf3a90a88
2019-04-29 20:46:34 -07:00
Yiwei Zhang
73bbed320a Merge "Zygote: add a way to preload Vulkan driver" into qt-dev
am: 862a21c977

Change-Id: I302b417b5a72fc2ab7f7920e65c1b7772cddbbba
2019-04-29 19:08:29 -07:00
John Reck
6d6c5c861b Merge "Fix some force_dark prop behaviors" into qt-dev
am: 8538ceba82

Change-Id: I8a977b15773a9d022a4f3dd59d1d2a607e5e624a
2019-04-29 18:45:33 -07:00
Mike Reed
2ee3743456 use new non-255 colormatrix
also use new naming convention for asAColorMode

Test: make

Change-Id: I32ddaf6d2d0ce9b0f29ee32e866879884fc926b4
2019-04-29 13:10:54 +00:00
Joe Onorato
7a406b47eb Don't include restricted images in incident reports unless they're specifically mentioned in the IncidentReportArgs
Test: adb shell incident -p EXPLICIT -s com.google.android.incident.gts/.ReportReadyReceiver 3025
Test: adb shell incident -p EXPLICIT -s com.google.android.incident.gts/.ReportReadyReceiver
Bug: 123543706
Change-Id: I2c55831b73338f68196838ee529e595f566e657f
2019-04-26 16:00:05 -07:00
Ben Wagner
5a31997b0e Remove SkCanvas::filterBitmap declaration.
It doesn't look like this even has an implementation anymore.

Test: This just removes dead code.
Change-Id: I126ad7f653e80973e0d79966a5885f486e2aa9f2
2019-04-26 10:39:37 -04:00
Sasha Smundak
5bad6247c3 Merge "Convert misc tests Android.mk files to Android.bp" am: ce22e11274 am: 86e0168d99
am: 734f295485

Change-Id: I57addbba602f513a726be956ed027535a16458f8
2019-04-26 06:45:34 -07:00
Sasha Smundak
734f295485 Merge "Convert misc tests Android.mk files to Android.bp" am: ce22e11274
am: 86e0168d99

Change-Id: I4a803f390f332d0c018cda1f0085a5da5201641d
2019-04-26 06:36:00 -07:00
Sasha Smundak
86e0168d99 Merge "Convert misc tests Android.mk files to Android.bp"
am: ce22e11274

Change-Id: I5389c6ba0e11204676c6a13175be781e26bb8905
2019-04-26 06:26:28 -07:00
Treehugger Robot
ce22e11274 Merge "Convert misc tests Android.mk files to Android.bp" 2019-04-26 13:10:24 +00:00
TreeHugger Robot
862a21c977 Merge "Zygote: add a way to preload Vulkan driver" into qt-dev 2019-04-26 05:20:34 +00:00
John Reck
8538ceba82 Merge "Fix some force_dark prop behaviors" into qt-dev 2019-04-25 23:37:05 +00:00
Kevin DuBois
f802abe47f hwui: ro.hwui.render_ahead=0 queue on high FPS
ro.hwui.render_ahead was behaving the same as -1 when it was set
to zero. Correct it so that ro.hwui.render_ahead will queue frames
when set to zero on any display rate FPS.

Fixes: 131340980
Test: Test presence or not of timestamps with -1,0,1,2 settings
Change-Id: Ibd1974253e947130fb03a0b86f599e0e5f5eac38
2019-04-25 16:05:01 -07:00
Yiwei Zhang
4bf3d9eda4 Zygote: add a way to preload Vulkan driver
Since HWUI render pipeline has both GL and Vulkan backends now, we'd
like to preload either GL or Vulkan driver based upon HWUI's choice on
the render backend.

1) Keep using ro.zygote.disable_gl_preload property to disable Vulkan
driver preloading if HWUI's render pipeline uses Vulkan backend.
Properly rename the corresponding APIs for driver preloading.

2) Add a path to preload Vulkan driver based on HWUI's render backend.

Bug: 131249898
Test: build, flash and boot.
Test: verified with set USE_VULKAN=true
Test: verified with setprop debug.hwui.renderer skiagl/skiavk
Change-Id: Ie0bf5d18edcf907c75a25ac3249e2620ec21b63c
2019-04-25 14:29:34 -07:00
John Reck
8915167a88 Fix some force_dark prop behaviors
* Make it persist.hwui.force_dark so the dev option
  survices reboots.

* Remove the internal super-override behavior it applied
  using only the intended ViewRootImpl theme-aware behavior.

Fixes: 127350499
Fixes: 130354206
Test: set dev option, verified nothing went dark. Set dark
theme, verified non-dark apps were force-darked. Rebooted
and verified property still set.

Change-Id: I43adcbc25320669510fb03b162c98cbd14612f55
2019-04-25 10:59:23 -07:00
Greg Daniel
51692ad9f5 Merge "Fix deletion of VkSemaphores in VulkanManager." into qt-dev am: f58e51b4e3
am: fd554ed0ad

Change-Id: Ie7f5a9542a44aebb56661e86f1247f44886f5a10
2019-04-24 22:01:34 -07:00
Greg Daniel
f58e51b4e3 Merge "Fix deletion of VkSemaphores in VulkanManager." into qt-dev 2019-04-24 23:30:35 +00:00
Mårten Kongstad
a2a34a3160 Merge "Add support for /oem/overlay" into qt-dev am: b0815b80e8
am: aa37c69107

Change-Id: I0bf94462253d016d6a17f383cd92f496a36f3772
2019-04-24 05:51:27 -07:00
TreeHugger Robot
b0815b80e8 Merge "Add support for /oem/overlay" into qt-dev 2019-04-24 08:33:38 +00:00
John Reck
bdcd59803b Merge "Disable flaky tests" into qt-dev am: 30a25acb83
am: 64bb45ad2a

Change-Id: I4523099930a8f5a105882fb2049266b75650770f
2019-04-24 01:11:37 -07:00
TreeHugger Robot
30a25acb83 Merge "Disable flaky tests" into qt-dev 2019-04-24 06:58:00 +00:00
Yao Chen
78754405f5 Merge "Add encryption in incidentd." into qt-dev am: a35c2f1224
am: 3583bd2e8f

Change-Id: I1ce9b81dcd1890649418548b51a37f594e7c2025
2019-04-23 21:41:41 -07:00
TreeHugger Robot
a35c2f1224 Merge "Add encryption in incidentd." into qt-dev 2019-04-24 01:01:25 +00:00
Yao Chen
43706b4470 Add encryption in incidentd.
+ Sections which require encryption will be encryted on disk.

+ When the sections are requested by clients (e.g., permission controller, report assignee),
  incidentd will decrypte the data.

+ For efficiency, encryption is done ONLY for sections that require encryption.

+ Use Keystore API for key management.

Bug: 131084614
Test: incidentd_test
Change-Id: I84d6b86807ba5bbde1051e847b2df6e79e6b5be5
2019-04-23 15:20:38 -07:00
Greg Daniel
27c762075d Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev am: 68406a2dd5
am: 663ab50411

Change-Id: I7e22af48449386dde99a9ce222414376a96b6958
2019-04-23 13:11:53 -07:00