Commit Graph

17653 Commits

Author SHA1 Message Date
Tim Murray 25a1b4894d am 4a1f02ea: Merge "Add foreground/boost cpuset." into mnc-dr-dev
* commit '4a1f02eaa3e35ac2d975a2e632880ac26daff3bb':
  Add foreground/boost cpuset.
2015-09-01 21:43:03 +00:00
Tom Cherry cda81d01c6 am 54c70ca1: Merge "init: Use classes for parsing and clean up memory allocations"
* commit '54c70ca15660529466b5b4e091209a20a3e75dff':
  init: Use classes for parsing and clean up memory allocations
2015-09-01 21:42:01 +00:00
Tom Cherry 54c70ca156 Merge "init: Use classes for parsing and clean up memory allocations" 2015-09-01 21:35:45 +00:00
Elliott Hughes 9597c6266b am 995f31ef: am 78ea165e: Merge "Use O_BINARY in base/file for Windows."
* commit '995f31efa19d9cd96fcccb560bc67a41f4e81022':
  Use O_BINARY in base/file for Windows.
2015-09-01 21:34:14 +00:00
Tim Murray 4a1f02eaa3 Merge "Add foreground/boost cpuset." into mnc-dr-dev 2015-09-01 21:23:35 +00:00
Elliott Hughes 995f31efa1 am 78ea165e: Merge "Use O_BINARY in base/file for Windows."
* commit '78ea165ea24e83a979939153ed4d3b075c07a779':
  Use O_BINARY in base/file for Windows.
2015-09-01 21:22:25 +00:00
Elliott Hughes 78ea165ea2 Merge "Use O_BINARY in base/file for Windows." 2015-09-01 21:13:33 +00:00
Nick Kralevich e94369085f Merge branch 'mnc-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/system/core into mnc-ub-dev 2015-09-01 21:08:43 +00:00
Elliott Hughes d7ca6dd059 Merge "Backport missing null check in "adb get-state"." into mnc-ub-dev 2015-09-01 21:02:23 +00:00
Pat Tjin 7af4865215 am 6442153c: Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev
* commit '6442153cbc673ee2f3799ed56eb4965f09ae40b8':
  fastboot: add flashing bootloader commands
2015-09-01 21:01:40 +00:00
Mark Salyzyn a5ce1a6fb0 resolved conflicts for merge of b2205bc7 to mnc-dr-dev-plus-aosp
Change-Id: I5e92335814494816607a68325a009c6bd0be4bd0
2015-09-01 13:43:04 -07:00
Mark Salyzyn 1fc1f9f6bb am 33f213c6: am cb19b08d: logd: refine is_prio
* commit '33f213c6069f10c145c0280b938f756ae759c74c':
  logd: refine is_prio
2015-09-01 20:40:32 +00:00
Pat Tjin 6442153cbc Merge "fastboot: add flashing bootloader commands" into mnc-dr-dev 2015-09-01 20:38:42 +00:00
Elliott Hughes 470d79a09c Use O_BINARY in base/file for Windows.
This matches the behavior of the google3/Chrome APIs. It's probably what you
want in all cases except where you plan on calling Split(content, "\n"), but
we should probably have something like simpleperf's LineReader for that
anyway.

Change-Id: I1a128ed8c328bc95b0b2ef4068a65a8562721418
2015-09-01 13:35:44 -07:00
Mark Salyzyn a4b2312387 am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev
* commit '3f5c5a1e6986a7cdafc4af10f17ddd631da83e40':
  logd: worst uid record watermark part three
2015-09-01 20:31:30 +00:00
Mark Salyzyn 287dea69e7 am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev
* commit 'bd44f59f5b1b7d08b5643563b9ab9abfb375e67e':
  logd: worst uid record watermark part deux
2015-09-01 20:31:29 +00:00
Mark Salyzyn b2205bc721 am bc193c53: healthd: logd: add timestamp to kernel logged battery messages
* commit 'bc193c53ecc740d0ac3de976c6654b90a24669b6':
  healthd: logd: add timestamp to kernel logged battery messages
2015-09-01 20:31:28 +00:00
Mark Salyzyn 33f213c606 am cb19b08d: logd: refine is_prio
* commit 'cb19b08dac6c486f64e0577bc4c0fd92e0ea4552':
  logd: refine is_prio
2015-09-01 20:31:27 +00:00
Mark Salyzyn 3f5c5a1e69 Merge "logd: worst uid record watermark part three" into mnc-dr-dev 2015-09-01 20:11:11 +00:00
Mark Salyzyn bd44f59f5b Merge "logd: worst uid record watermark part deux" into mnc-dr-dev 2015-09-01 20:11:00 +00:00
Daniel Rosenberg 11f0d159a1 am eb65ce0a: resolved conflicts for merge of 7c4ed6af to stage-aosp-master
* commit 'eb65ce0a240f9591019b8a40e17d25e86a131e35':
  fs_mgr: Add support for A/B partitions
2015-09-01 20:06:42 +00:00
Elliott Hughes 5b65f86a2f Backport missing null check in "adb get-state".
Bug: https://code.google.com/p/android/issues/detail?id=184011
Bug: http://b/23709037
Change-Id: Ia33814bd2adc310c2471cd6a12b9a73f27d77182
2015-09-01 19:57:07 +00:00
Daniel Rosenberg eb65ce0a24 resolved conflicts for merge of 7c4ed6af to stage-aosp-master
Change-Id: I52d0f66a6ad329daf19267be817c5a6d7118e7c4
2015-09-01 12:47:48 -07:00
Patrick Tjin 51e8b03f84 fastboot: add flashing bootloader commands
add the following commands:
    flashing unlock_bootloader
    flashing lock_bootloader
    flashing get_unlock_bootloader_nonce

Change-Id: Ia4f56ebdcb6785a5196cc669d68da1553ed53c58
Signed-off-by: Patrick Tjin <pattjin@google.com>
2015-09-01 12:40:12 -07:00
Tom Cherry b7349902a9 init: Use classes for parsing and clean up memory allocations
Create a Parser class that uses multiple SectionParser interfaces to
handle parsing the different sections of an init rc.

Create an ActionParser and ServiceParser that implement SectionParser
and parse the sections corresponding to Action and Service
classes.

Remove the legacy keyword structure and replace it with std::map's
that map keyword -> (minimum args, maximum args, function pointer) for
Commands and Service Options.

Create an ImportParser that implements SectionParser and handles the
import 'section'.

Clean up the unsafe memory handling of the Action class by using
std::unique_ptr.

Change-Id: Ic5ea5510cb956dbc3f78745a35096ca7d6da7085
2015-09-01 12:26:02 -07:00
Daniel Rosenberg 7c4ed6af79 Merge "fs_mgr: Add support for A/B partitions" 2015-09-01 19:24:09 +00:00
Elliott Hughes 59224c9537 resolved conflicts for merge of 46603db5 to mnc-dr-dev-plus-aosp
Change-Id: I3fb7ff8e9d9313c294620ae0ce63a17766940ec4
2015-09-01 11:25:24 -07:00
Yabin Cui 58c906478c am 14bf82e2: am 2ae47a0b: Merge "adb: add unit test for fdevent."
* commit '14bf82e21f7a8bec4bdeb8092cc2a86e3784fc4f':
  adb: add unit test for fdevent.
2015-09-01 16:50:02 +00:00
Yabin Cui 141057767a am 7a3dc5ea: am 1e19317e: Merge "adb: improve names for transport threads."
* commit '7a3dc5eacfb4f016481f97304ad80c510f353ca3':
  adb: improve names for transport threads.
2015-09-01 16:50:00 +00:00
Mark Salyzyn 50c500ca88 am 48d88c4b: am 6bb48f07: Merge "logd: worst uid record watermark part three"
* commit '48d88c4b69c4c336bda808364e7150a76cd02c3d':
  logd: worst uid record watermark part three
2015-09-01 16:49:58 +00:00
Yabin Cui 7685fd5492 am 85c04dfe: am 1531cee6: Merge "adb: remove workaround for b/6558362."
* commit '85c04dfeb6cf1a260ab87434fbeb8f315f6caa14':
  adb: remove workaround for b/6558362.
2015-09-01 16:49:57 +00:00
Elliott Hughes c6ab630656 am 8ef6077c: am 1498261f: Merge "Lose uptime to toybox."
* commit '8ef6077c15f26896fe9ec70b5dcde941812eb62a':
  Lose uptime to toybox.
2015-09-01 16:49:56 +00:00
Elliott Hughes 2fc3653ad9 am 7dbc0936: am b6bfd36c: Merge "Distinguish transport threads."
* commit '7dbc0936e858acb5842d35b67caf917e6f459dbb':
  Distinguish transport threads.
2015-09-01 16:49:54 +00:00
Siva Velusamy 06c0c391b5 am 1f9d3b07: am c9525ec3: Merge "adb: set thread names (linux & mac)"
* commit '1f9d3b07a6d1e1c1d537e4d9711fc2b3e43f3cb9':
  adb: set thread names (linux & mac)
2015-09-01 16:49:53 +00:00
Yabin Cui 14bf82e21f am 2ae47a0b: Merge "adb: add unit test for fdevent."
* commit '2ae47a0b54c51d05cfb5bab3e1d7a34d5d15ba1b':
  adb: add unit test for fdevent.
2015-09-01 16:37:39 +00:00
Yabin Cui 7a3dc5eacf am 1e19317e: Merge "adb: improve names for transport threads."
* commit '1e19317e575e1020cc0c241c4591a3f95f6a45c4':
  adb: improve names for transport threads.
2015-09-01 16:37:35 +00:00
Mark Salyzyn 48d88c4b69 am 6bb48f07: Merge "logd: worst uid record watermark part three"
* commit '6bb48f07db448756970266c94b6c7185557ba5a5':
  logd: worst uid record watermark part three
2015-09-01 16:37:25 +00:00
Yabin Cui 85c04dfeb6 am 1531cee6: Merge "adb: remove workaround for b/6558362."
* commit '1531cee658ecc46a8eda3c1bc13a09fd4fa73eb9':
  adb: remove workaround for b/6558362.
2015-09-01 16:37:22 +00:00
Elliott Hughes 8ef6077c15 am 1498261f: Merge "Lose uptime to toybox."
* commit '1498261fc5bc8896abbbc586f46992d6bf53ee46':
  Lose uptime to toybox.
2015-09-01 16:36:44 +00:00
Elliott Hughes 7dbc0936e8 am b6bfd36c: Merge "Distinguish transport threads."
* commit 'b6bfd36c19626ef1aca3b5d28092721c6b498a34':
  Distinguish transport threads.
2015-09-01 16:36:41 +00:00
Siva Velusamy 1f9d3b07a6 am c9525ec3: Merge "adb: set thread names (linux & mac)"
* commit 'c9525ec366232aa6a0968be1cc8e8abc37df789f':
  adb: set thread names (linux & mac)
2015-09-01 16:36:29 +00:00
Elliott Hughes 46603db57a Merge "Minimal fix for adb backup." into mnc-ub-dev 2015-09-01 16:35:21 +00:00
Yabin Cui 2ae47a0b54 Merge "adb: add unit test for fdevent." 2015-08-31 22:40:04 +00:00
Daniel Rosenberg 8bb2f36abd fs_mgr: Add support for A/B partitions
Allow partitions to be marked as A/B partitions
using the slotselect flag in fstab. The partitions
can be identified by appending the correct suffix
to the block device listed in the fstab. The suffix
is provided by the bootloader through a command line
parameter or the device tree, and can be found in
ro.boot.slot_suffix or read from the boot_control HAL.

Change-Id: I6846d80e857f95bfb8f282f4ab81167394613bbe
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2015-08-31 15:18:05 -07:00
Yabin Cui 1e19317e57 Merge "adb: improve names for transport threads." 2015-08-31 21:21:21 +00:00
Mark Salyzyn ae26b4d948 logd: worst uid record watermark part three
(cherry pick from commit ccfe8446a1)

Regression that cause records to be preserved for more than a day.

Bug: 23681639
Bug: 23685592
Change-Id: I5e4393c8e3ed935790994c77ec51dc6512a6daa6
2015-08-31 13:56:37 -07:00
Mark Salyzyn aa58a86275 logd: worst uid record watermark part deux
(cherry pick from commit 49afe0d00f)

Only record watermark if not known, or represents the worst UID
currently under focus. This has resulted in a halving of the average
prune time in the face of heavy spam because we get less processing
spikes.

Bug: 23327476
Bug: 23681639
Bug: 23685592
Change-Id: I19f297042b9fc2c98d902695c1c36df1bf5cd6f6
2015-08-31 13:55:54 -07:00
Mark Salyzyn 6bb48f07db Merge "logd: worst uid record watermark part three" 2015-08-31 20:52:29 +00:00
Mark Salyzyn ccfe8446a1 logd: worst uid record watermark part three
Regression that cause records to be preserved for more than a day.

Bug: 23681639
Bug: 23685592
Change-Id: I5e4393c8e3ed935790994c77ec51dc6512a6daa6
2015-08-31 20:51:42 +00:00
Yabin Cui 1531cee658 Merge "adb: remove workaround for b/6558362." 2015-08-31 20:35:45 +00:00