Nick Desaulniers
8dc561977f
Merge "libhardware: fix -Wreorder-init-list" am: b833bfbd5f
...
am: 93aa2fa353
Change-Id: I01a4ee7ce7fcdbe98730280e9263a5a55926c60c
2019-11-11 18:09:13 -08:00
Nick Desaulniers
93aa2fa353
Merge "libhardware: fix -Wreorder-init-list"
...
am: b833bfbd5f
Change-Id: I6cfaf4a0d191295386f70d508210178b6b5f16a5
2019-11-11 18:05:13 -08:00
Treehugger Robot
b833bfbd5f
Merge "libhardware: fix -Wreorder-init-list"
2019-11-12 01:48:58 +00:00
Nick Desaulniers
79149a378b
libhardware: fix -Wreorder-init-list
...
C++20 is stricter about member ordering in designated initializers than
C99.
Bug: 139945549
Test: mm
Change-Id: I045da46821280e720286a25a0c96b5750d1ad05e
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-11-11 14:41:57 -08:00
Inseob Kim
738edce4ac
Merge "Use shared version of vndk libmedia_helper" am: deb0edbe3a
...
am: 1f95cfe12e
Change-Id: Ice016e975e617026295688eee78f19bb00068907
2019-11-10 22:33:20 -08:00
Inseob Kim
1f95cfe12e
Merge "Use shared version of vndk libmedia_helper"
...
am: deb0edbe3a
Change-Id: I7c842647470af71c25232254df23d2165f257957
2019-11-10 22:29:54 -08:00
Treehugger Robot
deb0edbe3a
Merge "Use shared version of vndk libmedia_helper"
2019-11-11 06:15:20 +00:00
Colin Cross
84a156a9ec
Merge "Fix accidental implicit fallthroughs" am: 5a651961b0
...
am: 85a465e3f9
Change-Id: Id1a4e311d7732ce302440f67c93669a4ba7f16d0
2019-11-07 13:49:00 -08:00
Colin Cross
85a465e3f9
Merge "Fix accidental implicit fallthroughs"
...
am: 5a651961b0
Change-Id: Ib11ad4e2377383216799f3b5fd818a24f45e97de
2019-11-07 13:42:55 -08:00
Treehugger Robot
5a651961b0
Merge "Fix accidental implicit fallthroughs"
2019-11-07 21:28:12 +00:00
Colin Cross
377856d1be
Fix accidental implicit fallthroughs
...
-Wimplicit-fallthrough was printing warnings for these, they look
like real errors. Fix them and re-enable the error.
Test: treehugger
Change-Id: I818e18a995760f17b85b4c72ee577e531fa2a601
2019-11-01 16:37:17 -07:00
Xin Li
83a183bb40
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 1801697718
Change-Id: Ib28a3bb8869dc400206d20d787522627b3b374ea
2019-10-30 15:14:58 -07:00
Xin Li
1801697718
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I3cb6f2cf639cfea24033a226a2cca5b9ec0aeac7
2019-10-30 11:49:27 -07:00
Xin Li
848fe2469e
[automerger skipped] Merge Coral/Flame into AOSP master am: ce64df1817
-s ours am: da8d7a1836
-s ours
...
am: 7bc7675514
-s ours
am skip reason: change_id Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b with SHA1 ae5e519fd9
is in history
Change-Id: If51eece2b368fa40cdddf629da06ecd9be33cf34
2019-10-26 22:30:48 -07:00
Xin Li
7bc7675514
[automerger skipped] Merge Coral/Flame into AOSP master am: ce64df1817
-s ours
...
am: da8d7a1836
-s ours
am skip reason: change_id Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b with SHA1 ae5e519fd9
is in history
Change-Id: I993fa7dbebb4f13fa2a4b3e2891baa59915a0032
2019-10-26 22:23:56 -07:00
Xin Li
da8d7a1836
[automerger skipped] Merge Coral/Flame into AOSP master
...
am: ce64df1817
-s ours
am skip reason: change_id Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b with SHA1 ae5e519fd9
is in history
Change-Id: Ia59abbc2980287f40232cfc0bcf25678dbc57f7a
2019-10-26 22:07:32 -07:00
Xin Li
ce64df1817
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: I641d85c6a37479f4ec681766c8081642cd5cedd1
Merged-In: Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b
2019-10-25 10:28:01 -07:00
Peter Collingbourne
94f0d1a30f
Merge "gralloc: Configure framebuffer mode according to requested image format." am: 1e249a0769
am: ae5e519fd9
...
am: 30124221f4
Change-Id: I609e11a90b3bcb50d12b487a4d4b3cb43035d810
2019-10-23 16:04:05 -07:00
Peter Collingbourne
30124221f4
Merge "gralloc: Configure framebuffer mode according to requested image format." am: 1e249a0769
...
am: ae5e519fd9
Change-Id: Ic443e29836021f9db9a92d8001416847c57a59a2
2019-10-23 15:43:38 -07:00
Peter Collingbourne
ae5e519fd9
Merge "gralloc: Configure framebuffer mode according to requested image format."
...
am: 1e249a0769
Change-Id: Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b
2019-10-23 15:22:57 -07:00
Peter Collingbourne
1e249a0769
Merge "gralloc: Configure framebuffer mode according to requested image format."
2019-10-23 20:14:48 +00:00
Xin Li
c9885cf95c
Skip QD1A.190821.011 in stage-aosp-master am: ea65e73e17
...
am: d6f23f18aa
Change-Id: I6a985e5a67baff5e16f18e684284709048942c55
2019-10-18 13:08:19 -07:00
Xin Li
d6f23f18aa
Skip QD1A.190821.011 in stage-aosp-master
...
am: ea65e73e17
Change-Id: I959aa5bc5810a492b41d189865a7fdb85d1d29bc
2019-10-18 12:48:18 -07:00
Xin Li
ea65e73e17
Skip QD1A.190821.011 in stage-aosp-master
...
Bug: 141248619
Change-Id: I52a6899eed61d3b7e31e66d452f188e499342e8c
2019-10-16 15:19:21 -07:00
Peter Collingbourne
f2ed293b9b
gralloc: Configure framebuffer mode according to requested image format.
...
Previously we were ignoring the requested image format when mapping a graphics
device via gralloc_alloc, and using the mode that the framebuffer started up
in. This meant that on devices whose framebuffer starts up in a mode other
than RGBA8888, we would map the framebuffer in the other mode and attempt to
use it as an RGBA8888 framebuffer, which would lead to crashes or incorrecet
rendering. This is the case in the ARM FVP, whose framebuffer starts up in
RGB565 mode.
Unfortunately there is no preferred image format passed in to fb_device_open,
and we presumably cannot start passing one in for backwards compatibility
reasons. Therefore, we set the image format to RGBA8888, which appears to
be the only format that the platform ends up using.
Bug: 142352330
Change-Id: I24000fd36910b4044ce7659605efc423e36cba00
2019-10-15 17:50:25 -07:00
Xin Li
8457a9034a
[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 5cfe24991e
-s ours
...
am: 372aaa1667
-s ours
am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd
is in history
Change-Id: I6a71cf4dfc551345dcf6ff641725d5e59cc38fc1
2019-09-11 16:04:24 -07:00
Xin Li
372aaa1667
[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
...
am: 5cfe24991e
-s ours
am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd
is in history
Change-Id: I233b808ace2bca86eb4b431f8bebb4289cc12913
2019-09-11 15:58:23 -07:00
Xin Li
ddb55e56c5
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 96be24dec6
-s ours
...
am: 303b7be0b9
-s ours
am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd
is in history
Change-Id: I57193963b176c0294d24681edc5afd8de186f8ef
2019-09-11 14:52:16 -07:00
Xin Li
303b7be0b9
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: 96be24dec6
-s ours
am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd
is in history
Change-Id: I67bea0084039cbe836331183629ebaf0c6c63023
2019-09-11 14:04:33 -07:00
TreeHugger Robot
5cfe24991e
Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
2019-09-11 20:31:31 +00:00
Brian Duddie
814c1ea9f7
Merge "Update sensors OWNERS" am: f364e76947
am: d2f898c2c7
...
am: b3a9afa140
Change-Id: If707ac6f70a689182544f4dc1157e11fa1a628d7
2019-09-09 19:04:31 -07:00
Brian Duddie
b3a9afa140
Merge "Update sensors OWNERS" am: f364e76947
...
am: d2f898c2c7
Change-Id: I05b0ba18514c92070b5751a7c3ad47a9765baea6
2019-09-09 18:57:02 -07:00
Brian Duddie
d2f898c2c7
Merge "Update sensors OWNERS"
...
am: f364e76947
Change-Id: I88f35ccc1b5203b04702ca4b803c13841fcad881
2019-09-09 18:51:02 -07:00
Treehugger Robot
f364e76947
Merge "Update sensors OWNERS"
2019-09-10 01:37:18 +00:00
Brian Duddie
71a921d828
Update sensors OWNERS
...
Test: n/a
Change-Id: Idbf1b969ab4372c0aeb37bff3066c391c69e64a5
2019-09-09 15:01:59 -07:00
Xin Li
96be24dec6
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: I162046ce641900d9cc1717804ea9e02c84bbd49a
Merged-In: I8b74ae19788aaaca75ad44c465f7dc458117ccf1
2019-09-08 13:06:54 -07:00
Xin Li
013e175fa7
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c727d031fe
-s ours am: b8ec08f118
...
am: 5ba5357c36
Change-Id: I18a7f0f362f194e664ddd8fae7ecbbbe362b19eb
2019-09-05 14:20:10 -07:00
Xin Li
5ba5357c36
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c727d031fe
-s ours
...
am: b8ec08f118
Change-Id: I622691c9eda0a772aef75554c499e6bb1f2a55fb
2019-09-05 13:56:19 -07:00
Xin Li
b8ec08f118
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: c727d031fe
-s ours
am skip reason: subject contains skip directive
Change-Id: I8f6feefb5fd2a75c65b314c0419298d763c31db5
2019-09-05 13:20:15 -07:00
Xin Li
c727d031fe
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:24 +00:00
Xin Li
4eb6999bbd
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: I8b74ae19788aaaca75ad44c465f7dc458117ccf1
2019-09-04 13:34:19 -07:00
David Benjamin
1abb226ffc
Merge "Use bssl::UniquePtr." am: 681881da02
am: 4cb5d27ee8
am: c94d3334bb
...
am: 84e88070a1
Change-Id: If952936fa1f1be683ec8507009feff6e438bf8f9
2019-08-19 16:00:51 -07:00
David Benjamin
84e88070a1
Merge "Use bssl::UniquePtr." am: 681881da02
am: 4cb5d27ee8
...
am: c94d3334bb
Change-Id: I85fd7de36de44fd003650d8e4fb5e2ff115d07a5
2019-08-19 15:48:13 -07:00
David Benjamin
c94d3334bb
Merge "Use bssl::UniquePtr." am: 681881da02
...
am: 4cb5d27ee8
Change-Id: I95e60cb0098d6834fe0401a6b7c78258cea68e1f
2019-08-19 15:37:02 -07:00
David Benjamin
4cb5d27ee8
Merge "Use bssl::UniquePtr."
...
am: 681881da02
Change-Id: I5a408faa1c06692e36a689d378ad17a2b013067e
2019-08-19 15:20:55 -07:00
Treehugger Robot
681881da02
Merge "Use bssl::UniquePtr."
2019-08-19 21:40:40 +00:00
Siarhei Vishniakou
a6e0e58ecd
Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
am: 14f4acea32
am: e35998b7a3
...
am: 489f5cd1cc
Change-Id: I4d7bc9be3e614ddd74b5bc30b41f65d8e72e3f5b
2019-08-13 22:42:12 -07:00
Siarhei Vishniakou
489f5cd1cc
Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
am: 14f4acea32
...
am: e35998b7a3
Change-Id: Ie8259869952aee389cefeb7d1df0a288ceee1a4f
2019-08-13 22:31:16 -07:00
Siarhei Vishniakou
e35998b7a3
Merge "Remove custom timestamp from hw/libhw/input" am: 6b14bd1a08
...
am: 14f4acea32
Change-Id: Idc9a8c0f3479e12e4d8766f00c1f6d9dcb3170a5
2019-08-13 22:20:46 -07:00
Siarhei Vishniakou
14f4acea32
Merge "Remove custom timestamp from hw/libhw/input"
...
am: 6b14bd1a08
Change-Id: If9a4cf1d3ac09a1a1b853951f3af417669f10c54
2019-08-13 22:09:38 -07:00