Commit graph

28722 commits

Author SHA1 Message Date
Keun-young Park
2a47dbd150 Merge "add ro.boottime.init.mount_all.* for measuring mount time" am: 0c93ab67c6
am: e6a86f0bbb

Change-Id: I8fde62ad6737a4c5957278f6a0cc1660cdb88db0
2017-03-06 19:39:46 +00:00
Keun-young Park
e6a86f0bbb Merge "add ro.boottime.init.mount_all.* for measuring mount time"
am: 0c93ab67c6

Change-Id: Ib00eb7a66d317885f791cf80969ae75931309232
2017-03-06 19:36:49 +00:00
Keun-young Park
0c93ab67c6 Merge "add ro.boottime.init.mount_all.* for measuring mount time" 2017-03-06 19:25:50 +00:00
Alex Klyubin
c27f611ea6 Merge "Log stderr of secilc" am: 8b4e7fe486
am: 590cf28434

Change-Id: Ieefd0cd88aebbbd9fdc9372d86119867b2a5593e
2017-03-06 19:13:16 +00:00
Bowgo Tsai
944c9f667c Merge "fs_mgr: allow disable dm-verity when the device is unlocked without metadata" am: 17c84b2cca
am: 63b22a3eb1

Change-Id: I15110e1403bbd3b99f9f2ad72d1e092b83beeb0b
2017-03-06 19:09:47 +00:00
Alex Klyubin
590cf28434 Merge "Log stderr of secilc"
am: 8b4e7fe486

Change-Id: Ifb78f10609d36e4f20a45745f77e075d439ed861
2017-03-06 19:09:46 +00:00
Bowgo Tsai
63b22a3eb1 Merge "fs_mgr: allow disable dm-verity when the device is unlocked without metadata"
am: 17c84b2cca

Change-Id: I4e0e5ed112cb8d8abd0ee666e1c4d903713c9bbd
2017-03-06 19:06:48 +00:00
Treehugger Robot
8b4e7fe486 Merge "Log stderr of secilc" 2017-03-06 19:06:13 +00:00
Treehugger Robot
17c84b2cca Merge "fs_mgr: allow disable dm-verity when the device is unlocked without metadata" 2017-03-06 18:57:02 +00:00
Mark Salyzyn
700ba9591c Merge "liblogcat: introduce getopt_long_r" am: 58381648b1
am: 68741efbe3

Change-Id: I12097e6e01528c7ba9b6f95355fd7ff648accfe8
2017-03-06 18:32:49 +00:00
Mark Salyzyn
68741efbe3 Merge "liblogcat: introduce getopt_long_r"
am: 58381648b1

Change-Id: I3a3994f8f5d5f52b47239bd9aebb849a14eb3c8c
2017-03-06 18:26:20 +00:00
Treehugger Robot
58381648b1 Merge "liblogcat: introduce getopt_long_r" 2017-03-06 18:18:48 +00:00
Mark Salyzyn
e9ade17418 liblogcat: introduce getopt_long_r
Resolve one of the threading issues by creating a private C++ified
copy of getopt_long_r that started out its life as the bionic
getopt_long, but is reentrant.  Adds a new state context for the
stderr stream called optstderr.  Utilize this new function in logcat.
Control opterr and optstderr to match liblogcat expectations.  Correct
and fortify const.

Alternative would be to lock around _all_ getopt callers.  This has
the advantage of requiring _no_ locks that could get in the way of
using liblogcat in a signal handler.  The log reader interface does
run the risk of incurring locks and heap allocations though, so there
is more work to be done for that final goal.

Test: gTest logcat-unit-tests
Bug: 35326290
Change-Id: Ibb1b374c55d357d5d7fa5ad00bfaf07ae0bc4ba5
2017-03-06 08:40:16 -08:00
Mark Salyzyn
9f051eec77 Merge "liblog: logprint, error return and truncated data" am: 07169227e1
am: f7f0b53aec

Change-Id: I3cf6ba292a61cb68b9fa822120217ad99141bc82
2017-03-06 16:39:05 +00:00
Mark Salyzyn
f7f0b53aec Merge "liblog: logprint, error return and truncated data"
am: 07169227e1

Change-Id: I2adb74fe54dfb6a4a6cc4b3f1a2898d7e0650560
2017-03-06 16:36:38 +00:00
Mark Salyzyn
07169227e1 Merge "liblog: logprint, error return and truncated data" 2017-03-06 16:31:35 +00:00
Bowgo Tsai
7ad3159db9 fs_mgr: allow disable dm-verity when the device is unlocked without metadata
To start Treble VTS test, a single AOSP system.img will be flashed onto
the device. The size of AOSP system.img might be different than the
system partition size on device, making locating verity metadata fail
(at the last fixed size of the partition).

This change allows disabling dm-verity on system partition when the
device is unlocked (orange device state) with invalid metadata.

BUG: 35603549

Test: Boot bullhead with a different-sized system.img, checks verity is
      not enabled via:

          "adb shell getprop | grep partition.system.verified"

Change-Id: Id89d023e82c78ff1902ab7a528431cf7f65e49ad
2017-03-06 16:04:03 +08:00
Alex Klyubin
1185050767 Log stderr of secilc
This makes init log stderr of secilc invoked to compile SELinux
policy. Having an explanation for why secilc failed is very useful for
debugging boot issues.

Test: Device with PRODUCT_FULL_TREBLE boots up just fine
Test: Modified init.cpp to reference non-existent .cil file on a device
      with PRODUCT_FULL_TREBLE and confirmed that dmesg now contains the
      error message from secilc saying that the file was not found.
Bug: 31363362

Change-Id: I6a3b3576daf0d6fd09e2c79bc43ae63850f44a00
2017-03-05 14:29:16 -08:00
Ralph Nathan
d5f9ba7d0c Merge "Convert libbinderwrapper_test_support to be a static library" am: f5dea8b393
am: 062a372ca7

Change-Id: I3aabdf2d60774be20a675020c4b652a61a4a5deb
2017-03-04 07:11:18 +00:00
Ralph Nathan
062a372ca7 Merge "Convert libbinderwrapper_test_support to be a static library"
am: f5dea8b393

Change-Id: I4288e975812fa753393faf8e82831eeab10957fd
2017-03-04 07:08:48 +00:00
Treehugger Robot
f5dea8b393 Merge "Convert libbinderwrapper_test_support to be a static library" 2017-03-04 07:03:34 +00:00
Keun-young Park
69fae7b3dc add ro.boottime.init.mount_all.* for measuring mount time
- three properties: .early, .default, .late
- for tracking critical early boot times

bug: 35949600
Test: manual, getprop after boot

Change-Id: I851891518428e6e21cb43a2a6f982ab7db281d4c
2017-03-03 18:57:09 -08:00
Ralph Nathan
823aeffbcf Convert libbinderwrapper_test_support to be a static library
Some unittests require libbinderwrapper_test_support.so and fail
because it isn't on userdebug images.

Bug: 30631078, 35804180
Test: `make dist`

(cherry picked from commit 6515f36e43082ea105115de7e34d9cd09c77220a)

Change-Id: I4d8878de8963d0cbd29d6aca4b233ba674121688
2017-03-03 17:14:04 -08:00
Elliott Hughes
9208ed7d51 Merge "Small debuggerd improvements." am: 4463c820a6
am: 24cb6dd765

Change-Id: Ib778422f09d9d7fbfbc1069769097c7abf514adb
2017-03-04 00:37:02 +00:00
Elliott Hughes
24cb6dd765 Merge "Small debuggerd improvements."
am: 4463c820a6

Change-Id: I893c52600464c2541c2be8701d831a4d11e12836
2017-03-04 00:33:24 +00:00
Josh Gao
c92f1c2ba7 Merge "adb: turn on libusb by default." am: 817b2f3b2c
am: ef501512fa

Change-Id: If47ca0f1e6d09ff3dc9481f9cd68e6ff315f7781
2017-03-04 00:33:21 +00:00
Josh Gao
ef501512fa Merge "adb: turn on libusb by default."
am: 817b2f3b2c

Change-Id: Iaeefdcc45a5b96243b0b47822361d71c6e154b6e
2017-03-04 00:31:11 +00:00
Elliott Hughes
4463c820a6 Merge "Small debuggerd improvements." 2017-03-04 00:20:14 +00:00
Josh Gao
817b2f3b2c Merge "adb: turn on libusb by default." 2017-03-04 00:11:10 +00:00
Alex Klyubin
712ba302d0 Merge "Track the move of split SELinux policy CIL files" am: 8df4dded13
am: c46245a541

Change-Id: Ib3feef2a0c7db446208be74620116562ba1f8121
2017-03-03 21:53:22 +00:00
Alex Klyubin
c46245a541 Merge "Track the move of split SELinux policy CIL files"
am: 8df4dded13

Change-Id: I4c6f911ab9aa6062370e90d15f82a470cdcf8147
2017-03-03 21:50:26 +00:00
Alex Klyubin
8df4dded13 Merge "Track the move of split SELinux policy CIL files" 2017-03-03 21:43:24 +00:00
Mark Salyzyn
b1d150bc42 liblog: logprint, error return and truncated data
android_log_processBinaryLogBuffer and android_log_processLogBuffer
error return should have message and messageLen fields set to zero,
or to a valid-but-truncated buffer so that we can discern the
difference.  This will resolve an issue with reporting content from
an uninitialized field in liblogcat should caller add --debug flag.

To enhance the debugging capability, truncated string events because
of the logger limits are provided rather than dropping the field, but
still with an error return.

Some minor coding style issues resolved. Add required, or remove
extraneous spaces.  Use C-style comments only.

Test: gtest liblog-unit-tests
Bug: 27405083
Bug: 35326290
Change-Id: I4a7ddd7278fb1c582f921e1ba10e0765fadb791b
2017-03-03 11:10:11 -08:00
Alex Klyubin
c2a4c9ab9a Track the move of split SELinux policy CIL files
The three CIL files comprising split sepolicy are being moved from the
root directory to system and vendor directories based on whether the
file is for platform/system policy or non-platform/vendor policy.

Test: Device boots, no additional SELinux denials. This test was run
      for a device which has split policy and for a device which has
      monolithic policy.
Bug: 31363362
Change-Id: Ica49f0beae56be0f1cea7117e48bf2f6af8b848b
2017-03-03 10:35:10 -08:00
Alex Klyubin
b049bdc72a Merge "Include correct type of SELinux policy" am: 0ab93fdf3a
am: 18a826024b

Change-Id: I1f6da6ef96992bd46dde751da92a4e4063616758
2017-03-03 03:59:46 +00:00
Alex Klyubin
18a826024b Merge "Include correct type of SELinux policy"
am: 0ab93fdf3a

Change-Id: I2e82f03f15767296004acee2b04887888f849e6e
2017-03-03 03:55:40 +00:00
Treehugger Robot
0ab93fdf3a Merge "Include correct type of SELinux policy" 2017-03-03 03:50:49 +00:00
Elliott Hughes
12b7129406 Small debuggerd improvements.
Include the ABI in seccomp causes.

Slightly improved command-line usage information.

Fix crasher for seccomp failures.

Bug: N/A
Test: crasher
Change-Id: Ie419ecfe72ee4f5ccf49c927be18350a58a66a90
2017-03-02 19:01:20 -08:00
Keun-young Park
6ca378ba56 Merge "use ro.persistent_properties.ready for persistent props ready" am: 22cc398d76
am: 37bdcfcbdb

Change-Id: Ifebdb2473b434e489d7b516820a5f9ce3837178c
2017-03-02 22:46:29 +00:00
Keun-young Park
37bdcfcbdb Merge "use ro.persistent_properties.ready for persistent props ready"
am: 22cc398d76

Change-Id: Iead2f1ea10b5293ebb177292802e551e3e55bd58
2017-03-02 22:43:50 +00:00
Keun-young Park
22cc398d76 Merge "use ro.persistent_properties.ready for persistent props ready" 2017-03-02 22:41:30 +00:00
Alex Klyubin
b51f9abf45 Include correct type of SELinux policy
This makes the build system include split SELinux policy (three CIL
files and the secilc compiler needed to compile them) if
PRODUCT_FULL_TREBLE is set to true. Otherwise, the monolitic SELinux
policy is included.

Split policy currently adds around 400 ms to boot time (measured on
marlin/sailfish and bullhead) because the policy needs to be compiled
during boot. This is the main reason why we include split policy only
on devices which require it.

Test: Device boots, no additional SELinux denials. This test is
      performed on a device with PRODUCT_FULL_TREBLE set to true, and
      on a device with PRODUCT_FULL_TREBLE set to false.
Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and
      the three *.cil files, but does not contain the sepolicy file.
      Device with PRODUCT_FULL_TREBLE set to false contains sepolicy
      file but does not contain the secilc file or any *.cil files.
Bug: 31363362

Change-Id: I419aa35bad6efbc7f936bddbdc776de5633846fc
2017-03-02 13:25:17 -08:00
Josh Gao
f2f0b31850 adb: turn on libusb by default.
Bug: http://b/31321337
Test: python test_device.py
Change-Id: Idb2ff1108331bf505feeeb943b6be7bb78124618
2017-03-02 13:23:56 -08:00
Marissa Wall
3f4c0aa72a Merge changes I66d4fc71,I686dce91,I31325c76 am: 497cb085c7
am: 2993cc1e07

Change-Id: I65a08bed13c477193c38ac6770b5a92cef3ccca9
2017-03-02 21:00:40 +00:00
Marissa Wall
2993cc1e07 Merge changes I66d4fc71,I686dce91,I31325c76
am: 497cb085c7

Change-Id: I4a8ada072f2a131db3ff0e8abb6d7aaba9ccf501
2017-03-02 20:57:50 +00:00
Treehugger Robot
497cb085c7 Merge changes I66d4fc71,I686dce91,I31325c76
* changes:
  libadfhwc: Fix adf_hwc_close
  libadfhwc: add adf_set_active_config_hwc2 support
  libadfhwc: support hwc2 display attributes
2017-03-02 20:54:44 +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