Commit Graph

29765 Commits

Author SHA1 Message Date
Steven Moreland ae4c956012 Merge "libcutils: compile with BOARD_VNDK_VERSION current" am: f358bed624
am: dd9a91f109

Change-Id: I6006b664c42faa2d135e040321e9cd48589e2710
2017-04-18 14:59:54 +00:00
Steven Moreland dd9a91f109 Merge "libcutils: compile with BOARD_VNDK_VERSION current"
am: f358bed624

Change-Id: Idc1ad70ec01687eb23f2eff584751088f122e59f
2017-04-18 14:54:52 +00:00
Treehugger Robot f358bed624 Merge "libcutils: compile with BOARD_VNDK_VERSION current" 2017-04-18 14:46:27 +00:00
Mark Salyzyn 732f30ee8e Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e am: 6ad16cda19
am: 7b45da1006

Change-Id: I5969bd70c30e1f4f4e7fbff337a4a1e16ed03176
2017-04-18 14:29:21 +00:00
Mark Salyzyn 7b45da1006 Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e
am: 6ad16cda19

Change-Id: I3e44fdd82fb5ec8a1beffa759df82a67556ea16a
2017-04-18 14:23:53 +00:00
Mark Salyzyn 6ad16cda19 Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e
* changes:
  logd: instrument tests better for failure
  liblog: log_time add explicit to some constructors.
  logd: iterator corruption paranoia
  logd: regression in handling watermark boundary.
2017-04-18 14:17:12 +00:00
Mark Salyzyn 24aa9a41e1 logd: instrument tests better for failure
Failure to open socket misbehaved and told us nothing.

Test: gTest logd-unit-tests
Bug: 37378309
Change-Id: Iec369a50ccb1027e96947465e90d9572c9f4047f
2017-04-17 15:10:26 -07:00
Mark Salyzyn d87d47f7dd liblog: log_time add explicit to some constructors.
Add explicit to constructors, to prevent implicit conversions.

Test: compile
Bug: 37378309
Change-Id: I3f9f8d561e84c492eafa6528db7c238da072dad8
2017-04-17 15:10:26 -07:00
Mark Salyzyn 3614a0c5d4 logd: iterator corruption paranoia
Add checking for impossible(tm) scenarios within LogBuffer::flushTo:

1) When iterating through the log entries, check if the iterator
   returns two identical element references and break out of the loop.
2) Cap the maximum number of log entries we will skip while holding
   the iterator lock at 4194304, break out of the loop.

We print a message to the kernel logs if we hit these cases.

ToDo: Remove this paranoia at some future date.

Test: gTest liblog-unit-tests logcat-unit-tests and logd-unit-tests
Bug: 37378309
Change-Id: I789594649db14093238828b9f6d1daeca8b780c2
2017-04-17 15:10:26 -07:00
Mark Salyzyn 5836379b21 logd: regression in handling watermark boundary.
Deal with a regression introduced in commit
5a34d6ea43 (logd: drop mSequence from
LogBufferElement) where log_time was compared against nsec() time
miscalculating the watermark boundary.  When dealing with logcat
-t/-T, or any tail reading, add a margin to prune to back off by a
period of 3 seconds (pruneMargin).

Test: gTest liblog-unit-tests logcat-unit-tests and logd-unit-tests
Bug: 37378309
Change-Id: I72ea858e4e7b5fa91741ea84c40d2e7c3c4aa031
2017-04-17 15:10:26 -07:00
Tom Cherry b7ef4726ff Merge "ueventd: create classes for dev and sys permissions" am: ffa38cfc1e
am: e29fa61725

Change-Id: Ia0f7ea669fe7ee948b1572fd923fab041cf630c2
2017-04-17 21:46:46 +00:00
Steven Moreland d73be1b96b libcutils: compile with BOARD_VNDK_VERSION current
- moved __android_log_is_debuggable to a new public header
    (log_properties.h)
- vendor version of sched_policy uses ALOG* instead SLOG*

Test: (sanity) liblog-unit-tests
Test: (sanity) libcutils_test (noting b/b/32972117, two tests continue
  to fail)
Test: system/core as a whole makes with BOARD_VNDK_VERSION := current
  now with no problems.
Test: boots/works on internal marlin
Bug: 33241851

(cherry picked from commit 1f83aa424f)

Merged-In: I5bc1f348dc0f0c8814bec5b5c3d2c52c825ab640
Change-Id: I5bc1f348dc0f0c8814bec5b5c3d2c52c825ab640
2017-04-17 14:44:17 -07:00
Tom Cherry e29fa61725 Merge "ueventd: create classes for dev and sys permissions"
am: ffa38cfc1e

Change-Id: Idc3ecf436d5750564de4ba16f0811c1d76cc609d
2017-04-17 21:42:11 +00:00
Tom Cherry ffa38cfc1e Merge "ueventd: create classes for dev and sys permissions" 2017-04-17 21:34:12 +00:00
Wei Wang d7652f553c Merge "init.rc: set initial cpuset to all cores" am: 66f44d823f
am: eb9ddd14f1

Change-Id: I5dce107407c04212e667099d1da0d67f96a6322d
2017-04-17 20:15:43 +00:00
Wei Wang eb9ddd14f1 Merge "init.rc: set initial cpuset to all cores"
am: 66f44d823f

Change-Id: I5caa54781b72126a01171fcf483eca488d90f7b5
2017-04-17 20:10:43 +00:00
Wei Wang 66f44d823f Merge "init.rc: set initial cpuset to all cores" 2017-04-17 20:01:43 +00:00
Chris Fries b174f19f24 Merge changes from topic '36810152' am: b7826a74f2
am: a14353e664

Change-Id: Iae75cb1bf56186a797f0e7a60e62d361c248866a
2017-04-17 19:41:42 +00:00
Chris Fries a14353e664 Merge changes from topic '36810152'
am: b7826a74f2

Change-Id: I7ab0cc7268efb9ab6a560c0aa968ec565cac16d0
2017-04-17 19:36:43 +00:00
Tom Cherry cc054c9da8 ueventd: create classes for dev and sys permissions
Create classes for dev and sys permissions and store these permissions
in std::vector instead of the C list.

Test: boot bullhead
Test: init unit tests

Change-Id: I874039a3db29b4c70149506da8e407123ab7eca2
2017-04-17 19:33:04 +00:00
Chris Fries b7826a74f2 Merge changes from topic '36810152'
* changes:
  fastboot: Support larger transfers during flash
  fastboot: Cap max size sent to libsparse
  fastboot: add AdbWinUsbApi as a required module
2017-04-17 19:31:38 +00:00
Chris Fries 0ea946c007 fastboot: Support larger transfers during flash
Adding methods to queue and download flashable images by fd instead of
by pointer, so that we can deal with sending large (up to 4GB) files
on windows and linux.  This gets past limitations on linux to read
more than 2GB from a file at a time, as well as memory limitations
on win32, in order to download up to 4GB in a single transfer.

Test: fastboot -w
Test: "flash-all" from nexus factory images site (incl. fastboot -w update)
Test: fastboot flash with large and small image, large and small max-download-size
Test: Sanity check flashing on win32, darwin, linux.
Test: Sanity check 3GB image download (with 3GB max-download-size)
      on win32, darwin, linux.

Bug: 36810152
Change-Id: I528d739d344eb080d59d721dadf3b3b34d4b375e
2017-04-17 09:22:49 -05:00
Elliott Hughes 298ae04ad6 Merge "Add a README.md about our shell and utilities." am: 75d195693b
am: 48f034932b

Change-Id: I61380d247f1f5a3cb903bf35932690e293f17a22
2017-04-15 15:43:33 +00:00
Elliott Hughes 48f034932b Merge "Add a README.md about our shell and utilities."
am: 75d195693b

Change-Id: I05279fbc5de92efa6e8a5fb2a51e702b0e1427d5
2017-04-15 15:40:04 +00:00
Treehugger Robot 75d195693b Merge "Add a README.md about our shell and utilities." 2017-04-15 15:33:41 +00:00
Bowgo Tsai 6f3ec3d759 Merge "Set libavb version into system property for Treble OTA" am: e8311491da
am: 7b08869382

Change-Id: Ic445d12e5fc26a1a534011c7033d79e730538653
2017-04-15 05:55:57 +00:00
Bowgo Tsai 7b08869382 Merge "Set libavb version into system property for Treble OTA"
am: e8311491da

Change-Id: I867972462df8d5830aa520a9d227ca4d8f9f8be2
2017-04-15 05:52:58 +00:00
Bowgo Tsai e8311491da Merge "Set libavb version into system property for Treble OTA" 2017-04-15 05:49:25 +00:00
Bowgo Tsai 1a898c25f9 Set libavb version into system property for Treble OTA
Set ro.boot.avb_version to "AVB_VERSION_MAJOR.AVB_VERSION_MINOR".
During Treble OTA match, the major version must be the same as that in
the avb metadata on disk, while the minor version can be equal or
greater to that in the avb metadata on disk.

See how avb versioning work on the following link:

  https://android-review.googlesource.com/#/c/342757/

Also renames AvbHashtreeDisabled() -> hashtree_disabled().

Bug: 35322304
Test: Early mount with AVB, checks [ro.boot.avb_version]: [1.0] exists.
Test: Not enable AVB, checks [ro.boot.avb_version] doesn't exists.

Change-Id: I5aaf476ca53c4fe817779518ba14b68ebcfdc6d6
2017-04-15 09:47:31 +08:00
Elliott Hughes 5a0818a633 Add a README.md about our shell and utilities.
This is definitely a FAQ, and it doesn't make sense for me to maintain
this on Google+ when I have the power to just check it in (and now have
a sensible place to do so).

Bug: N/A
Test: N/A
Change-Id: I649803ac846917a45f4b7b89cffe5b450179c479
2017-04-14 17:59:55 -07:00
Keun-young Park 8a8ac86cf6 Merge "check ext4 magic before running next steps" am: 82bd278dc4
am: 9183d0701d

Change-Id: I0ef0cfe69695dce01398cd6fe7a469d4ddbbba4e
2017-04-15 00:33:06 +00:00
Keun-young Park 9183d0701d Merge "check ext4 magic before running next steps"
am: 82bd278dc4

Change-Id: I78a510725a199b5056ede41492e07b45dce022f5
2017-04-15 00:30:35 +00:00
Keun-young Park 82bd278dc4 Merge "check ext4 magic before running next steps" 2017-04-15 00:26:32 +00:00
Elliott Hughes 246a7e57b8 Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6
am: aee26df200

Change-Id: I52782f3954cfe697dfa134ef778b0835650d5e16
2017-04-15 00:21:35 +00:00
Elliott Hughes aee26df200 Merge "Revert "Send property_service AVC messages to the kernel audit system""
am: eea60804f6

Change-Id: I030cd689a554f6af953a95fc903ffad31280486a
2017-04-15 00:18:34 +00:00
Elliott Hughes eea60804f6 Merge "Revert "Send property_service AVC messages to the kernel audit system"" 2017-04-15 00:13:47 +00:00
Wei Wang 2e83b86a8a init.rc: set initial cpuset to all cores
Starting zygote early requires cpuset to be initialized to all cores for
foreground cpuset. Change to expolit all cores by default at boot and
let device manufacturers override to proper values in device specific
init script.

Bug: 36576280
Test: marlin boot fast and checked cpuset during early boot
Change-Id: I2c1ce0630e58a7b04d1a453c6740d3f0bce9de9f
2017-04-14 15:03:29 -07:00
Tom Cherry dfb81ce15a Merge changes I9d0482d1,Ib82833be am: b87f1c1728
am: 43473d3a54

Change-Id: I64d1dcf789eea0c6a184368be869f04a2933b47e
2017-04-14 21:51:53 +00:00
Tom Cherry 43473d3a54 Merge changes I9d0482d1,Ib82833be
am: b87f1c1728

Change-Id: Ia031560d95ab967ea12d4c971de32308c5bb9888
2017-04-14 21:49:24 +00:00
Tom Cherry b87f1c1728 Merge changes I9d0482d1,Ib82833be
* changes:
  ueventd: convert platform_names from C list to std::vector
  ueventd: replace char* with std::string in struct uevent
2017-04-14 21:44:35 +00:00
Mark Salyzyn fa80674a19 Merge changes I596b8706,I262c0377,Iaf2bee97 am: 030b4d1b08
am: 3447f72d43

Change-Id: If957237f25beff6343f726ba1723b3486dbaf8dd
2017-04-14 21:39:34 +00:00
Mark Salyzyn 3447f72d43 Merge changes I596b8706,I262c0377,Iaf2bee97
am: 030b4d1b08

Change-Id: Id2f09fb60bc772a55206c70b3385fa0651e83233
2017-04-14 21:37:07 +00:00
Mark Salyzyn 030b4d1b08 Merge changes I596b8706,I262c0377,Iaf2bee97
* changes:
  liblog: allow event tags to include some punctuations
  liblog: logprint supports number of seconds time event field
  logcat: test: standardize rest() to let logs land when injecting
2017-04-14 21:33:23 +00:00
Mark Salyzyn 00c87bcf73 Merge "logd: statistics truncate name" am: 42d524f73d
am: 7f9719be48

Change-Id: I3751a3acb99562a20a1cdfe728e4e3fe210c69f9
2017-04-14 20:56:50 +00:00
Mark Salyzyn 7f9719be48 Merge "logd: statistics truncate name"
am: 42d524f73d

Change-Id: I0070356dbf0fc18babb3720ed038b5db2245e295
2017-04-14 20:54:47 +00:00
Treehugger Robot 42d524f73d Merge "logd: statistics truncate name" 2017-04-14 20:48:43 +00:00
Chris Fries 6a99971096 fastboot: Cap max size sent to libsparse
This is required for large (>INT_MAX) sparse limit reported by
the target.

Also, patch up return chains of "int" that need to deal with sizes
bigger than 2GB as well as return negative error codes.

Test: -S works with large max-download-size
Test: Flash 3GB system.img with max-download-size 2.5GB

Bug: 36810152
Change-Id: I562a50eabd706bd5b97c71a1aef07c1ffd1a2e5c
2017-04-14 15:44:20 -05:00
Chris Fries 4bf1be7ec8 fastboot: add AdbWinUsbApi as a required module
fastboot uses AdbWinUsbApi on Windows, let's keep it required.

Test: rm -rf out/host; mma fastboot and confirm AdbWinUsbApi is in out/
Bug: 36810152
Change-Id: Ica8b27cb1d0bca260f716dc61fdcea2ccc282623
2017-04-14 15:43:47 -05:00
Josh Gao da1f886ed8 Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b
am: 750dfee974

Change-Id: I0553a8c70ac8a04bd2a32138e2bdd5f63e894258
2017-04-14 20:10:04 +00:00
Josh Gao ae80841ac7 adb: kill adb_thread_{create, join, detach, exit}. am: e1dacfc1b6
am: d56eebd6c2

Change-Id: Ifde4ae5035c4caf5df66c640bfc28e163dd60b5a
2017-04-14 20:09:58 +00:00