Greg Hackmann
02574bf00a
Merge changes from topic 'adf-uapi-cleanup' am: ae03c6917d am: 16cebae0af
...
am: 556ae0c7b8
Change-Id: I28584d9fc61df73441eebac42bc4f26509c00c43
2017-02-01 04:48:59 +00:00
Greg Hackmann
f0d66e72f6
libadf: move ADF uapi header out of bionic am: fe79bcbef8 am: 42429e6c0d
...
am: 1293809fb6
Change-Id: I5ad56a436c11fcf0f1587066a6776bb93cd8ac43
2017-02-01 04:48:10 +00:00
Greg Hackmann
c89cefb69c
libadf: adf_test: fix clang + kati build am: 09f8f986a9 am: 33d2307567
...
am: 8b680f9c3f
Change-Id: I6895bc1b5eb671d368ecf4ec856a43d3ad32ef7a
2017-02-01 04:48:00 +00:00
Greg Hackmann
556ae0c7b8
Merge changes from topic 'adf-uapi-cleanup' am: ae03c6917d
...
am: 16cebae0af
Change-Id: I8cf14618968680da15a8f631afd243da5a1e96d8
2017-02-01 04:46:12 +00:00
Greg Hackmann
1293809fb6
libadf: move ADF uapi header out of bionic am: fe79bcbef8
...
am: 42429e6c0d
Change-Id: Idf1968251ebd7afeb62318378bcc15cf78addde1
2017-02-01 04:45:33 +00:00
Greg Hackmann
8b680f9c3f
libadf: adf_test: fix clang + kati build am: 09f8f986a9
...
am: 33d2307567
Change-Id: I29392e60e5ee2f2b8301bc63d0d4cf65fc7a73d8
2017-02-01 04:45:22 +00:00
Greg Hackmann
16cebae0af
Merge changes from topic 'adf-uapi-cleanup'
...
am: ae03c6917d
Change-Id: Ib23305be0f628cdb858d791474737bbfa34a13ea
2017-02-01 04:44:20 +00:00
Greg Hackmann
42429e6c0d
libadf: move ADF uapi header out of bionic
...
am: fe79bcbef8
Change-Id: Ifdc2cd16dcdc50c96a578687aa280cf91010b3ef
2017-02-01 04:43:05 +00:00
Greg Hackmann
33d2307567
libadf: adf_test: fix clang + kati build
...
am: 09f8f986a9
Change-Id: Ie09d5973cae00ba2e54e6e062c2709207adf71e7
2017-02-01 04:42:59 +00:00
Treehugger Robot
ae03c6917d
Merge changes from topic 'adf-uapi-cleanup'
...
* changes:
libadf: move ADF uapi header out of bionic
libadf: adf_test: fix clang + kati build
2017-02-01 04:38:15 +00:00
James Hawkins
57d30faa92
Merge "bootstat: Update the wording of 'soft reboot' to 'runtime restart'." am: 31cf946d5b am: 0d5300a12d
...
am: 28a393f534
Change-Id: I2183f083b58cb62a24ce1b5ff775e47bb9023cb1
2017-02-01 03:40:32 +00:00
James Hawkins
28a393f534
Merge "bootstat: Update the wording of 'soft reboot' to 'runtime restart'." am: 31cf946d5b
...
am: 0d5300a12d
Change-Id: I4bd92d160270234dadc442f28042114d71fc2854
2017-02-01 03:35:15 +00:00
James Hawkins
0d5300a12d
Merge "bootstat: Update the wording of 'soft reboot' to 'runtime restart'."
...
am: 31cf946d5b
Change-Id: Ia8c25373932be946fc78d33622a2177d99154688
2017-02-01 03:23:15 +00:00
Treehugger Robot
31cf946d5b
Merge "bootstat: Update the wording of 'soft reboot' to 'runtime restart'."
2017-02-01 03:18:18 +00:00
James Hawkins
f1c2350668
bootstat: Update the wording of 'soft reboot' to 'runtime restart'.
...
In an effort to be more accurate with respect to terminology.
Bug: None
Test: None
Change-Id: Ida8e118975e715c686aa7fd526f964e78c06aa06
2017-02-01 01:30:08 +00:00
Paul Lawrence
c5ce074200
Merge "Expand seccomp whitelist" am: 2cd07e8b97 am: c6030b290d
...
am: 2d9d99f398
Change-Id: I8ccf9736d353d49a0018212c25a47b1820cd69f7
2017-02-01 01:26:36 +00:00
Paul Lawrence
2d9d99f398
Merge "Expand seccomp whitelist" am: 2cd07e8b97
...
am: c6030b290d
Change-Id: Id391b26003abade0ecc6aab2db4b452bbbc88eba
2017-02-01 01:24:07 +00:00
Paul Lawrence
c6030b290d
Merge "Expand seccomp whitelist"
...
am: 2cd07e8b97
Change-Id: Ifb12885c6fa7d0f16306984d10a8da4b4b9d1a20
2017-02-01 01:21:38 +00:00
Treehugger Robot
2cd07e8b97
Merge "Expand seccomp whitelist"
2017-02-01 01:17:43 +00:00
Paul Lawrence
8afdd2aac6
Expand seccomp whitelist
...
Bug: 34817266
Test: Boots, app starts
Change-Id: I39026064ec6c7130256ae463163c1f7634e3bdd4
2017-01-31 15:26:00 -08:00
Greg Hackmann
fe79bcbef8
libadf: move ADF uapi header out of bionic
...
ADF isn't a candidate for upstreaming and isn't (directly) usable from
unprivileged NDK code, so it makes more sense to keep video/adf.h as a
private header inside libadf, where it'll still be usable by HWC
implementations without shipping in the NDK.
libadf exports its entire include/ directory, so this shouldn't have
any impact on HWC implementations that already link against libadf.
Test: mmm system/core/adf/libadf
Test: /data/nativetest64/adf-unit-tests/adf-unit-tests (on Nexus 9)
Change-Id: I14532d59005196e002f7465474ac3c7cc9e59bd3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2017-01-31 23:08:26 +00:00
Paul Lawrence
8840e75f71
Merge "Expand seccomp whitelist" am: 301e7e2cdb am: 329417241e
...
am: 32ad0ad150
Change-Id: Ifcf1c09624d622abce2f9c69966da25ce8bcec09
2017-01-31 22:56:45 +00:00
Greg Hackmann
09f8f986a9
libadf: adf_test: fix clang + kati build
...
kati needs us to add "tests" as a subdir of the libadf Android.bp.
clang also requires an explicit definition of AdfTest::dev_id where
g++ does not.
Test: mmm system/core/adf/libadf
Test: /data/nativetest64/adf-unit-tests/adf-unit-tests (on Nexus 9)
Change-Id: I1fc371af1b5b115f088edd963a87e6647a52882b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2017-01-31 22:55:46 +00:00
Paul Lawrence
32ad0ad150
Merge "Expand seccomp whitelist" am: 301e7e2cdb
...
am: 329417241e
Change-Id: I19023b91ef48560d20b2678e2b4789f983cc409c
2017-01-31 22:51:51 +00:00
Paul Lawrence
329417241e
Merge "Expand seccomp whitelist"
...
am: 301e7e2cdb
Change-Id: I95275cc837f87c7025b74ddc56ba3477d2789798
2017-01-31 22:48:45 +00:00
Treehugger Robot
301e7e2cdb
Merge "Expand seccomp whitelist"
2017-01-31 22:44:44 +00:00
Paul Lawrence
ae3f906093
Expand seccomp whitelist
...
Bug: 34813887
Bug: 34809883
Bug: 34767389
Bug: 34719286
Test: Device boots, the app in b/34719286 runs when it didn't before
Change-Id: Iad198e3ca620e7a07464b0d182f969bb807bd948
2017-01-31 08:35:00 -08:00
Mark Salyzyn
7fa16297ab
Merge "logcat: test: inject() tuning" am: 26a714a0ab am: 7acdb2c9e3
...
am: 74aa911277
Change-Id: I732b85a7bb09bfa3d0ce6a70aed14e7e6aaefbfc
2017-01-31 16:07:56 +00:00
Mark Salyzyn
74aa911277
Merge "logcat: test: inject() tuning" am: 26a714a0ab
...
am: 7acdb2c9e3
Change-Id: I27a6d12e13499bf4fd886508c267f5a89cf626b6
2017-01-31 16:05:26 +00:00
Mark Salyzyn
7acdb2c9e3
Merge "logcat: test: inject() tuning"
...
am: 26a714a0ab
Change-Id: Ie7f63c15466e8d82cc61da100439466984b89472
2017-01-31 16:03:26 +00:00
Treehugger Robot
26a714a0ab
Merge "logcat: test: inject() tuning"
2017-01-31 15:59:22 +00:00
Josh Gao
b18c446415
Merge changes Ibd7bbddb,I2f571009 am: 53f2d82951 am: 4178ab53c2
...
am: 7aad80af25
Change-Id: I9aac23c4a9cbb58f6c48937a2cf83254225438d3
2017-01-31 04:07:12 +00:00
Josh Gao
c57f59e1c1
debuggerd: fix debuggerd <pid> am: 1e4afb52c5 am: cc1110f1f3
...
am: f1286729de
Change-Id: I578d36b4938e347699870c802dc9322f1a36f916
2017-01-31 04:07:04 +00:00
Josh Gao
98175e5e59
debuggerd: fix debuggerd -b <pid> am: b53f903cf1 am: b5be6e3017
...
am: 48e5ce8bd3
Change-Id: Idce33914d00ef4b8e55cd73f99dede7181826326
2017-01-31 04:06:57 +00:00
Josh Gao
35e23ed267
Merge "debuggerd_handler: improve nonfatal signal message." am: 698035b8fe am: d78eb9cd9e
...
am: ed967379b0
Change-Id: Ie7f2c38493316e18b6a016e37b1d9b345bb79af2
2017-01-31 04:06:45 +00:00
Josh Gao
7aad80af25
Merge changes Ibd7bbddb,I2f571009 am: 53f2d82951
...
am: 4178ab53c2
Change-Id: Idab0d44ce3010535a9a3f52dd7878a33277542f1
2017-01-31 04:05:11 +00:00
Josh Gao
f1286729de
debuggerd: fix debuggerd <pid> am: 1e4afb52c5
...
am: cc1110f1f3
Change-Id: I268022825530367b711e385f480364d7a9e5eda5
2017-01-31 04:05:05 +00:00
Josh Gao
48e5ce8bd3
debuggerd: fix debuggerd -b <pid> am: b53f903cf1
...
am: b5be6e3017
Change-Id: I9996765b2da89a8cf041447d147c28f49fda6b42
2017-01-31 04:04:59 +00:00
Josh Gao
ed967379b0
Merge "debuggerd_handler: improve nonfatal signal message." am: 698035b8fe
...
am: d78eb9cd9e
Change-Id: Id90058e901bd6ab149c6dbfd451236dae0152c3c
2017-01-31 04:04:45 +00:00
Josh Gao
4178ab53c2
Merge changes Ibd7bbddb,I2f571009
...
am: 53f2d82951
Change-Id: If9a0933ff470540e8d03d20379f6d593d3422f8c
2017-01-31 04:02:41 +00:00
Josh Gao
cc1110f1f3
debuggerd: fix debuggerd <pid>
...
am: 1e4afb52c5
Change-Id: I331559a71d88b495d81e7b980864560597d57492
2017-01-31 04:02:40 +00:00
Josh Gao
b5be6e3017
debuggerd: fix debuggerd -b <pid>
...
am: b53f903cf1
Change-Id: I1debdd851ae51a5e9aeeca9f7c7f970518c17283
2017-01-31 04:02:33 +00:00
Josh Gao
d78eb9cd9e
Merge "debuggerd_handler: improve nonfatal signal message."
...
am: 698035b8fe
Change-Id: Ia7f8c7629c8a2390fb7b4e048e2d46216678c811
2017-01-31 04:02:17 +00:00
Treehugger Robot
53f2d82951
Merge changes Ibd7bbddb,I2f571009
...
* changes:
debuggerd: fix `debuggerd <pid>`
debuggerd: fix `debuggerd -b <pid>`
2017-01-31 03:58:10 +00:00
Josh Gao
698035b8fe
Merge "debuggerd_handler: improve nonfatal signal message."
2017-01-31 03:57:20 +00:00
Josh Gao
1e4afb52c5
debuggerd: fix debuggerd <pid>
...
Bug: none
Test: `debuggerd mediaserver`
Change-Id: Ibd7bbddb92a99ce49622c0ecc9329a3723f2085d
2017-01-30 17:58:04 -08:00
Josh Gao
b53f903cf1
debuggerd: fix debuggerd -b <pid>
...
Dump all of the threads when using `debuggerd -b`.
Bug: http://b/34719257
Test: `debuggerd -b mediaserver`
Change-Id: I2f57100985e5b0c2bf019482ba9feff31921692f
2017-01-30 17:58:04 -08:00
Josh Gao
4ed00c8d73
debuggerd_handler: improve nonfatal signal message.
...
"Fatal signal 35 (???)" -> "Requested dump for"
Bug: http://b/34809044
Test: debuggerd -b $$
Change-Id: I9ece0ee1117203d30142b843973ed7e5435e21da
2017-01-30 17:58:04 -08:00
mtezych
3185d5f693
Merge "libsync: Replace inserting tuple into unordered_map in favour of pair." am: 0617179c8c am: 32b3c649f5
...
am: 2a75fa607a
Change-Id: I7da31d2d9d1fcdabbf5ca3516b235a0237293948
2017-01-31 01:24:22 +00:00
mtezych
e911d262df
libsync: Replace inserting tuple into unordered_map in favour of pair. am: 380b2f4fea am: 3500cee3e1
...
am: 898f852d38
Change-Id: Ic05dbf0be2ccbb524d984b3bde26a6b70c05320a
2017-01-31 01:23:32 +00:00