Commit graph

17518 commits

Author SHA1 Message Date
Yasuhiro Matsuda
fcdd7ea34f am 7b0bdec4: Merge "Add a tag for tracing system server."
* commit '7b0bdec4b294dff29af1cf75118be5f3d2b346b9':
  Add a tag for tracing system server.
2015-09-02 14:25:48 +00:00
Yasuhiro Matsuda
7b0bdec4b2 Merge "Add a tag for tracing system server." 2015-09-02 12:54:23 +00:00
Tom Cherry
cd7d73faf6 am 68df4bd0: Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev
* commit '68df4bd08bfb550456cc8edb19fa894a124db38c':
  DO NOT MERGE init: Fix parsing of multiple property triggers
2015-09-02 02:23:45 +00:00
Tom Cherry
68df4bd08b Merge "DO NOT MERGE init: Fix parsing of multiple property triggers" into mnc-dr-dev 2015-09-02 02:06:39 +00:00
Tom Cherry
8b72ea3f25 DO NOT MERGE init: Fix parsing of multiple property triggers
Triggers of the form on property:a=b && property:b=c are only
triggered on the transition of a->b (given that b=c), but not on the
transition of b->c (given that a=b).

This commit allows both transitions to trigger the property as expected

Bug 23631258

Change-Id: I9f70b4cbf36f8a99d10c37ad049ae8ceb378d610
2015-09-01 23:54:35 +00:00
Badhri Jagan Sridharan
ddc296e841 am e1801863: init: usb: Add init scripts for configfs commands
* commit 'e18018639bd38e959118d16d567c7567bb88d80b':
  init: usb: Add init scripts for configfs commands
2015-09-01 23:36:57 +00:00
Badhri Jagan Sridharan
723b410ff5 am 48d59acc: init.usb.rc: Add new system property for configfs
* commit '48d59acc57701dce66113544ccf2a711e21fb1f4':
  init.usb.rc: Add new system property for configfs
2015-09-01 23:36:56 +00:00
Badhri Jagan Sridharan
e18018639b init: usb: Add init scripts for configfs commands
This CL adds a new init script init.usb.configfs.rc
to add generic configfs commands. Setting
sys.usb.configfs in init.usb.{hardware}.rc
enables executing commands in this script

Bug=23633457

Change-Id: Iaae844a7957d6c9bf510648aaff86d56aa0c6243
2015-09-01 15:39:22 -07:00
Badhri Jagan Sridharan
48d59acc57 init.usb.rc: Add new system property for configfs
This CL helps to execute a different set of
commands for the usb configs specified in
init.usb.rc. Aimed at using configfs based
commands over android composition driver.

Bug=23633457

Change-Id: Ifa5f804e1cff93d15ad57d0ed553300bc5868936
2015-09-01 15:39:22 -07:00
Elliott Hughes
0b23a08b27 am 1428640f: am 5d804006: Merge "adb/base win32 tests: fix comment and open() flags"
* commit '1428640f5cf69ede7dcafa7ae5ecca5a0a4fff50':
  adb/base win32 tests: fix comment and open() flags
2015-09-01 22:39:00 +00:00
Tom Cherry
3be66edc59 init: Update readme.txt to reflect recent changes to init.
Updates are as follows:

A detailed explanation of event triggers and property triggers
including how they can now be used

A new section describing .rc files, their locations, and the
intentions for each of these locations

A new section describing the import keyword and how it is not a
command but rather its own section

Removal of deprecated or incorrect text

Change-Id: If0a37375ac92a857900f3303ada4ba742360daff
2015-09-01 15:32:33 -07:00
Tom Cherry
af20a7cb12 resolved conflicts for merge of cda81d01 to mnc-dr-dev-plus-aosp
Change-Id: I747b279bc49f9f82b8f8859c49b3fc2a4e3b4977
2015-09-01 15:30:56 -07:00
Elliott Hughes
1428640f5c am 5d804006: Merge "adb/base win32 tests: fix comment and open() flags"
* commit '5d8040060515128f2bee9b4759d0618b90c4d70c':
  adb/base win32 tests: fix comment and open() flags
2015-09-01 22:10:57 +00:00
Elliott Hughes
5d80400605 Merge "adb/base win32 tests: fix comment and open() flags" 2015-09-01 22:03:41 +00:00
Spencer Low
2fbeb0cc71 adb/base win32 tests: fix comment and open() flags
Match base's use of O_BINARY.

Change-Id: I930b5c8fddde20966580069f2e681b99cb26f1a3
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-01 14:57:58 -07:00
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