Commit graph

30580 commits

Author SHA1 Message Date
TreeHugger Robot
701120d319 Merge "libmemtrack: check return value for getMemory()" 2017-03-02 20:03:49 +00:00
Bo Hu
78328f0f1f Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" am: 8c35491151 -s ours am: 21e2e90eb8 -s ours
am: f71bf5345f  -s ours

Change-Id: If88ad0cb8283ef3d4d74a1f2443499403deb5997
2017-03-02 18:15:28 +00:00
bohu
feb82d68f9 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe am: 294d44be33 -s ours am: cb95cfa1f4 -s ours
am: 8d00827b1f  -s ours

Change-Id: I7288dc6fcf903fe475226cc726831404b55d5795
2017-03-02 18:14:37 +00:00
Bo Hu
f71bf5345f Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" am: 8c35491151 -s ours
am: 21e2e90eb8  -s ours

Change-Id: I2f4e7716ecac5d8b2d6b3ec0cfca3e37212054b9
2017-03-02 18:13:27 +00:00
bohu
8d00827b1f DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe am: 294d44be33 -s ours
am: cb95cfa1f4  -s ours

Change-Id: I14390fd41a1f6879c8ff6d35d68e1a408b64ba91
2017-03-02 18:12:36 +00:00
Bo Hu
21e2e90eb8 Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe"
am: 8c35491151  -s ours

Change-Id: Id963d9bb263e5bc2553f16497ddf8a08bb1fd77f
2017-03-02 18:10:31 +00:00
bohu
cb95cfa1f4 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
am: 294d44be33  -s ours

Change-Id: I50c8def74e6bec2e1071000e0530ffb9920a14a6
2017-03-02 18:09:36 +00:00
Bo Hu
8c35491151 Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" 2017-03-02 18:03:30 +00:00
Alex Klyubin
e310332227 Merge "Use split SELinux policy at boot, if available" am: 056eca201b am: a3ccbe6abc
am: 9000f0f868

Change-Id: Ic04767bd6ad22abe98556f0da17c7d820f9ae61c
2017-03-02 01:18:23 +00:00
Alex Klyubin
9000f0f868 Merge "Use split SELinux policy at boot, if available" am: 056eca201b
am: a3ccbe6abc

Change-Id: If5325bc1a9de07becf72eed295116889323055c2
2017-03-02 01:13:52 +00:00
Alex Klyubin
a3ccbe6abc Merge "Use split SELinux policy at boot, if available"
am: 056eca201b

Change-Id: Ib56a7c0f50babf6eaa70bea083610ff484d784d9
2017-03-02 01:08:21 +00:00
Treehugger Robot
056eca201b Merge "Use split SELinux policy at boot, if available" 2017-03-02 01:02:15 +00:00
bohu
294d44be33 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
Traditionally, qemu_pipe has both the declaration and implentation of each
function in one header file--qemu_pipe.h, and it is getting incovenient to
maintain.

This CL separates the implementation of functions from the header file,
and makes qemu_pipe a static library for other modules to link to.

Note that the interface and implementation of qemu_pipe are kept unchanged,
and future CLs will enhance the implementation to make it more reliable and
more compatible with old and new API levels.

Following projects are affected by this refactoring, and they are modified
accordingly:

device/generic/goldfish
device/generic/goldfish-opengl
hardware/ril/reference-ril

Change-Id: I541ecbf0cc7eadeef9d4e37ffd9ca7bfcc5c94c0
2017-03-01 16:33:44 -08:00
Mark Salyzyn
c90abae8c6 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list" am: a02a42ecb1 am: 7fa61d6878
am: 2a9ce60dc6

Change-Id: Id7b1ee4272bb690da63a5fc99fd10d00cc61b977
2017-03-02 00:07:25 +00:00
Mark Salyzyn
d6f27f3eb1 Merge "liblogcat: replace NULL with nullptr" am: 7826f853bc am: dcf6021ee1
am: fe4e8518cb

Change-Id: I88685d92b9ba905d8f04bae001ac6840e1e620c3
2017-03-02 00:07:14 +00:00
Mark Salyzyn
2a9ce60dc6 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list" am: a02a42ecb1
am: 7fa61d6878

Change-Id: I9d2c583e3b675bebb6909bf14c9c78cf8188de41
2017-03-02 00:02:50 +00:00
Mark Salyzyn
fe4e8518cb Merge "liblogcat: replace NULL with nullptr" am: 7826f853bc
am: dcf6021ee1

Change-Id: I553c77d877e18424566bb14111bad2adbfa2cf1e
2017-03-02 00:02:39 +00:00
Mark Salyzyn
7fa61d6878 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list"
am: a02a42ecb1

Change-Id: Ib840fe387efc669aec8aa61ec5b6dfa6b25726d8
2017-03-01 23:57:50 +00:00
Mark Salyzyn
dcf6021ee1 Merge "liblogcat: replace NULL with nullptr"
am: 7826f853bc

Change-Id: Ic2e33c1c81cbbb83b459359403739cd98fdab2e7
2017-03-01 23:57:39 +00:00
Treehugger Robot
a02a42ecb1 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list" 2017-03-01 23:52:54 +00:00
Treehugger Robot
7826f853bc Merge "liblogcat: replace NULL with nullptr" 2017-03-01 23:50:01 +00:00
Josh Gao
970177a313 Merge "debuggerd: remove obsolete dumpable check." am: b038995d29 am: ec172b5f36
am: 05930f7179

Change-Id: I5ca838f564a83a81e68054fedb0d68cf9e3ac468
2017-03-01 23:22:55 +00:00
Josh Gao
05930f7179 Merge "debuggerd: remove obsolete dumpable check." am: b038995d29
am: ec172b5f36

Change-Id: I5e64c85a0e634c008bc77bf03b9317268e862eb1
2017-03-01 23:09:35 +00:00
Josh Gao
ec172b5f36 Merge "debuggerd: remove obsolete dumpable check."
am: b038995d29

Change-Id: Ib120244b965f10ff88c917885beca011ee28a223
2017-03-01 23:05:06 +00:00
Josh Gao
b038995d29 Merge "debuggerd: remove obsolete dumpable check." 2017-03-01 22:59:01 +00:00
Alex Klyubin
16696e201b Use split SELinux policy at boot, if available
This modifies init's loading of SELinux policy into the kernel to
load the split (platform/system vs non-platform/vendor) policy if it's
present. If the split policy is not present, the usual monolithic
policy is loaded into the kernel, same as before.

Split policy is loaded by first compiling it from CIL form using
secilc compiler into the conventional monolithic/compiled form which
is then loaded into the kernel.

The build system has not yet been modified to place split policy onto
devices. Thus, this commit currently has no effect. For testing split
policy, build plat_sepolicy.cil, nonplat_sepolicy.cil, and
mapping_sepolicy.cil, and place them into the root directory of the
device.

The following tests were performed for a device with monolithic policy
and for the same device with split policy.

Test: Device boots, no new denials
Test: Play Movies plays back movies
Test: Load ip6.me im Chrome
Bug: 31363362
Change-Id: I9a75a48ac88f3392abc36669f91b0803e88cd147
2017-03-01 14:07:40 -08:00
TreeHugger Robot
b7b9f71024 Merge "Update graphics-base.h makefile." 2017-03-01 20:46:15 +00:00
Josh Gao
981761bbb2 debuggerd: remove obsolete dumpable check.
PR_SET_DUMPABLE is ignored now.

Bug: http://b/35872161
Test: debuggerd -b `pidof surfaceflinger`
Change-Id: Iefd090f2b762d454d1e6ce8061ff5f992974267c
2017-03-01 11:55:16 -08:00
Bowgo Tsai
9cce616cea Merge "init: skip early mount in recovery mode" am: 8951c1313d am: 6befc485c7
am: f00d05610b

Change-Id: I8a7dd60f99cfcda88b01892c129af24e3f61a3aa
2017-03-01 18:36:48 +00:00
Bowgo Tsai
f00d05610b Merge "init: skip early mount in recovery mode" am: 8951c1313d
am: 6befc485c7

Change-Id: I5963d2f181fe9ce9bfed982f54a8e1b152d7dd26
2017-03-01 18:31:18 +00:00
Bowgo Tsai
6befc485c7 Merge "init: skip early mount in recovery mode"
am: 8951c1313d

Change-Id: Ie9e199acaa9577ad72c6d57cc6cbc1be895fb4a4
2017-03-01 18:28:48 +00:00
Treehugger Robot
8951c1313d Merge "init: skip early mount in recovery mode" 2017-03-01 18:21:17 +00:00
Mark Salyzyn
b45a175cdc liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list
Deal with yet another reentrancy issue with strtok() and do not
treat optarg as fungible data, allocate a temporary copy.  Add
support in the -v flag and environmental variable ANDROID_PRINTF_LOG
for a comma-separated list of format and format modifiers.

Test: manual + gTest logcat-unit-tests
Bug: 35326290
Change-Id: I073e5676d59ba41bfd36df86942342766ef730f1
2017-03-01 08:48:33 -08:00
Mark Salyzyn
de022a841f liblogcat: replace NULL with nullptr
- Replace all NULL, macro defined to 0, with nullptr.  nullptr is a
  keyword of type nullptr_t, with a value of (nullptr_t)0, a pointer
  type of sizeof(void*) that can not confusingly promote to an int.
- Replace all boolean evaluations of values against 0, NULL, and
  nullptr with direct, ! or !! as appropriate.
- Note that thread_stopped should be semaphore, defer that to
  a non-code-quality improvement patch.
- Check for null context in android_logcat_destroy.
- Run clang-format to realign format with setting.

Test: compile and gTest logcat-unit-tests
Bug: 35326290
Change-Id: Iaf729cd7899c6cece78431536ed325604f0e353f
2017-03-01 08:48:04 -08:00
Bowgo Tsai
32232724fb init: skip early mount in recovery mode
We don't need early mount in recovery mode for security considerations,
e.g., users should explicitly select 'mount /system' from the recovery
menu. This CL checks the existence of file "/sbin/recovery" and skip
early mount when it is found.

Bug: 35853576
Test: early mount /vendor without dm-verity on sailfish
Test: early mount not happen in recovery mode on sailfish
Change-Id: I69cc96f6fd0de6ce493082921738a958dd571115
2017-03-02 00:30:58 +08:00
Elliott Hughes
b161357b1f Merge "There's no longer a limit to property names." am: b6cb9b0457 am: 734aacf679
am: fc41c88f26

Change-Id: I10b43a27c25cb917736a99877212ec180577d332
2017-03-01 00:10:42 +00:00
Elliott Hughes
fc41c88f26 Merge "There's no longer a limit to property names." am: b6cb9b0457
am: 734aacf679

Change-Id: Ia936f33eda1ba49f53ff0763938769c1dae1bc16
2017-03-01 00:08:40 +00:00
Elliott Hughes
734aacf679 Merge "There's no longer a limit to property names."
am: b6cb9b0457

Change-Id: I668c7298cdcb8b57f1397c3ef5469ad6f141ea66
2017-03-01 00:06:40 +00:00
Treehugger Robot
b6cb9b0457 Merge "There's no longer a limit to property names." 2017-03-01 00:03:58 +00:00
Ryan Campbell
a4f5d12b71 Merge "Add global GCOV_PREFIX option." am: df0f792a9e am: 2d3378350a
am: 11339c7e34

Change-Id: I10d53220ea5e433ae0f027bf21750a239a588e9c
2017-02-28 23:37:10 +00:00
Ryan Campbell
11339c7e34 Merge "Add global GCOV_PREFIX option." am: df0f792a9e
am: 2d3378350a

Change-Id: I43118ceb85d6acbd27ca3e65796c980dea9ac693
2017-02-28 23:34:41 +00:00
Ryan Campbell
2d3378350a Merge "Add global GCOV_PREFIX option."
am: df0f792a9e

Change-Id: Ia3c990cc5d3e838a92ecb7dd144843f872b1ae7e
2017-02-28 23:32:11 +00:00
Treehugger Robot
df0f792a9e Merge "Add global GCOV_PREFIX option." 2017-02-28 23:28:45 +00:00
Keun-young Park
75361b8d55 Merge "add base::WaitForPropertyCreation" am: 22a64b3a8a am: e3d4615f80
am: e861d362f8

Change-Id: Id35b59423b7e5b6515c8355d643563721773b55f
2017-02-28 22:46:45 +00:00
Keun-young Park
534aa7adab Merge "set ro.boottime.persistent_properties when persisted props are restored" am: 73c6544b08 am: bba9f8a9b2
am: 78a2947a64

Change-Id: I05af48cb79b3eaf9656302c8cdc6b94094b34655
2017-02-28 22:46:38 +00:00
Keun-young Park
e861d362f8 Merge "add base::WaitForPropertyCreation" am: 22a64b3a8a
am: e3d4615f80

Change-Id: I0d1370f9dbb11e605a511286f669cd2e0eb8b47b
2017-02-28 22:44:11 +00:00
Keun-young Park
78a2947a64 Merge "set ro.boottime.persistent_properties when persisted props are restored" am: 73c6544b08
am: bba9f8a9b2

Change-Id: Icb82fb72966431be856b202e113095c3f11920cc
2017-02-28 22:44:06 +00:00
Keun-young Park
e3d4615f80 Merge "add base::WaitForPropertyCreation"
am: 22a64b3a8a

Change-Id: I19719bf134fbd23a5473ecdeecc049c78a727028
2017-02-28 22:42:14 +00:00
Keun-young Park
bba9f8a9b2 Merge "set ro.boottime.persistent_properties when persisted props are restored"
am: 73c6544b08

Change-Id: I97c564b93fbc37a898ca937f2d28f372c6687fe7
2017-02-28 22:42:08 +00:00
Keun-young Park
22a64b3a8a Merge "add base::WaitForPropertyCreation" 2017-02-28 22:39:41 +00:00