Commit Graph

29589 Commits

Author SHA1 Message Date
Jerry Zhang c6faf65758 Merge "Add ffs.mtp.ready triggers to mtp configs."
am: a06ac26dd1

Change-Id: I7e3e206172d1385f27bea26d5d3e0471cc13ec8b
2017-04-27 22:12:31 +00:00
Jerry Zhang a06ac26dd1 Merge "Add ffs.mtp.ready triggers to mtp configs." 2017-04-27 21:58:44 +00:00
Steven Moreland 3257727096 Merge "libtrusty: Android.mk -> Android.bp"
am: de70e33092

Change-Id: Ic18c86fd29f3793026fb830d91ad44d62b3aed42
2017-04-27 20:20:45 +00:00
Treehugger Robot de70e33092 Merge "libtrusty: Android.mk -> Android.bp" 2017-04-27 20:02:17 +00:00
Tom Cherry 2be5884903 Merge "init: fix last_reboot_reason string"
am: 59c74a3bd1

Change-Id: I77a91f303ffce4f040d774047d2c72920c1acaee
2017-04-27 19:49:30 +00:00
Treehugger Robot 59c74a3bd1 Merge "init: fix last_reboot_reason string" 2017-04-27 19:39:53 +00:00
Elliott Hughes 8e0ded0c6c Merge "Make "fastboot update" respect $TMPDIR."
am: 8e0ccc9ff3

Change-Id: I74e6b2fb1e69de03960dfb0bfdd711af9e9cbd8f
2017-04-27 15:52:22 +00:00
Elliott Hughes 8e0ccc9ff3 Merge "Make "fastboot update" respect $TMPDIR." 2017-04-27 15:40:03 +00:00
Steven Moreland f304a20523 libtrusty: Android.mk -> Android.bp
Test: links

Change-Id: Ic64361f98e9e51b62bfda8b2b1c3a00ae03f0a37
2017-04-26 18:58:18 -07:00
Elliott Hughes bbfc281485 Make "fastboot update" respect $TMPDIR.
Bug: http://b/32701538
Test: TMPDIR=/ fastboot update
Change-Id: I06d1bc8d43b306855dfe19bc736513d3336df287
2017-04-26 17:20:36 -07:00
Jerry Zhang fb256b696b Add ffs.mtp.ready triggers to mtp configs.
This allows devices to use functionfs for mtp and ptp instead
of the ordinary functions. The property is set regardless of
which function is enabled so mtp and ptp functions will continue
to work.

Bug: 33220530
Test: use mtp with ffs and non ffs devices
Change-Id: I4527e153bd10ef1e262e487482ae455835d1c698
2017-04-26 17:11:50 -07:00
Steven Moreland 5076014708 Merge "libbinderwrapper: Android.mk -> Android.bp"
am: 8a85c253bf

Change-Id: I48f566cc646a6b708a34389b8836a4441fe86af5
2017-04-26 23:34:36 +00:00
Treehugger Robot 8a85c253bf Merge "libbinderwrapper: Android.mk -> Android.bp" 2017-04-26 23:24:58 +00:00
Keun-young Park 0020d4c076 Merge "set default shutdown timeout to 6 secs"
am: 47d15ed5b9

Change-Id: I076911247627894009490047caa9f04b8e616755
2017-04-26 22:43:29 +00:00
Keun-young Park 47d15ed5b9 Merge "set default shutdown timeout to 6 secs" 2017-04-26 22:35:26 +00:00
Keun-young Park 76a3b3ce5c Merge "do not start shutdown animation from init"
am: 84d43c8df7

Change-Id: I2cc5860c125a34b356bff9b62a9027ee293da683
2017-04-26 21:05:41 +00:00
Keun-young Park fadad58262 Merge "add additional dump for timeout"
am: 8cde09064e

Change-Id: I7413854112a4d4d2f8e286e7f8be177ec4e282dc
2017-04-26 21:05:22 +00:00
Treehugger Robot 84d43c8df7 Merge "do not start shutdown animation from init" 2017-04-26 20:59:56 +00:00
Keun-young Park 7feab68238 set default shutdown timeout to 6 secs
- Test data shows that most shutdown finishes in 6 secs.
- The original 10 secs is too long wih no shutdown animation
  running in screen.

bug: 36657139
Test: check time with reboot
Change-Id: I9a805ddfde8156b066485902048d0cd01365c453
2017-04-26 13:58:31 -07:00
Keun-young Park 8cde09064e Merge "add additional dump for timeout" 2017-04-26 20:53:21 +00:00
Tom Cherry 4ba72d9b73 Merge changes Ibe91fd2d,I59e2bd9e
am: b0a14f8feb

Change-Id: Ibe4e68e4f6127841faee2a2f15400672f9aceef0
2017-04-26 19:54:18 +00:00
Treehugger Robot b0a14f8feb Merge changes Ibe91fd2d,I59e2bd9e
* changes:
  init: remove 'computing context for service'... message
  init: use full command for exec services' names
2017-04-26 19:46:04 +00:00
Keun-young Park 1663e97fe1 add additional dump for timeout
- add sysrq-trigger current tasks dump
- This helps detecting kernel thread stuck in a specific driver

bug: 37573746
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 2000 -f -e 15 -w 30  -v -a

Change-Id: Icb20b5fba63d601bb937f004f5889a9bc8340b34
2017-04-26 10:16:23 -07:00
Philip Cuadra adecf17de6 Merge "Allow Bluetooth HAL CAP_SYS_NICE"
am: 1ac29896b0

Change-Id: I071fdbd0af6d7f39cf031abb51c54d289585693e
2017-04-26 17:02:17 +00:00
Philip Cuadra 1ac29896b0 Merge "Allow Bluetooth HAL CAP_SYS_NICE" 2017-04-26 16:56:00 +00:00
Erik Staats b81797446d Merge "Change get_sched_policy to check "schedtune" and "cpuset"."
am: e74ecbfddd

Change-Id: I497c3e0dfb307e4072317e2da72ffc183ab6044a
2017-04-26 16:44:34 +00:00
Erik Staats e74ecbfddd Merge "Change get_sched_policy to check "schedtune" and "cpuset"." 2017-04-26 16:40:44 +00:00
Tom Cherry 47336cebc3 init: fix last_reboot_reason string
This got moved when refactoring the reboot commands.

Bug: 37540660
Test: verify bullhead's last_reboot_reason is correct
Change-Id: I3b86496fc469ca41645df7e7ba8bb51dd25b6b38
2017-04-26 16:17:08 +00:00
Mark Salyzyn a4015dce4c Merge "logd: add Chattiest LOG_TAG statistics"
am: 8c437b95d3

Change-Id: Id9a368dd5e70cb233525c1d56da61a42bd18cdcc
2017-04-26 15:54:00 +00:00
Treehugger Robot 8c437b95d3 Merge "logd: add Chattiest LOG_TAG statistics" 2017-04-26 15:50:23 +00:00
Tom Cherry 6f7ef2fb34 init: remove 'computing context for service'... message
This line shows up immediately before starting a service for each
service without a 'seclabel' option, essentially becoming log spam.

We already log if we fail to compute the context as well.

Test: Boot bullhead

Change-Id: Ibe91fd2dd9f53a8ae2ca95ccea1636ecef2af224
2017-04-25 17:46:13 -07:00
Tom Cherry 86e31a8123 init: use full command for exec services' names
Before:
init: starting service 'exec 4 (/system/bin/vdc)'...
init: starting service 'exec 5 (/system/bin/tzdatacheck)'...
init: starting service 'exec 6 (/system/bin/bootstat)'...
init: starting service 'exec 7 (/system/bin/bootstat)'...

After:
init: starting service 'exec 4 (/system/bin/vdc --wait cryptfs mountdefaultencrypted)'...
init: starting service 'exec 5 (/system/bin/tzdatacheck /system/usr/share/zoneinfo /data/misc/zoneinfo)'...
init: starting service 'exec 6 (/system/bin/bootstat -r post_decrypt_time_elapsed)'...
init: starting service 'exec 7 (/system/bin/bootstat --record_boot_complete)'...

Test: Boot bullhead, observe above logging change
Change-Id: I59e2bd9e3d341bbed9537c972e47246d0a12769d
2017-04-25 17:35:46 -07:00
Bowgo Tsai 8954cd9379 Merge "init: fix first stage mount failure when two fstab entries have verity_loc"
am: 8df35dcb1c

Change-Id: I243c97a4512ba1ef5ff03ee3bf6a6e41b4cba94a
2017-04-26 00:14:28 +00:00
Treehugger Robot 8df35dcb1c Merge "init: fix first stage mount failure when two fstab entries have verity_loc" 2017-04-26 00:06:47 +00:00
Steven Moreland 4c06e42abf libbinderwrapper: Android.mk -> Android.bp
Test: links

Change-Id: I63332b8d02f8499b165b4069a8c88e459f276f90
2017-04-25 15:55:26 -07:00
Christopher Ferris 897a7b0056 Merge "Add the Dwarf CFA handling."
am: 1c036ebc15

Change-Id: I25eb52b3ae10fcf771f5451a28399b03a0b082d7
2017-04-25 22:29:50 +00:00
Christopher Ferris 1c036ebc15 Merge "Add the Dwarf CFA handling." 2017-04-25 22:12:49 +00:00
Tom Cherry d45b6f44d5 Merge "init: rename 'Trigger' to 'Event' and convert to std::variant"
am: d9ebf06117

Change-Id: I1753f980ce4f1aec644c341608877af14cbb248c
2017-04-25 21:53:10 +00:00
Tom Cherry 4cd8d5e9f5 Merge changes I1f70f2c4,I698ca962,Idbbf2682
am: 960ed3ce1b

Change-Id: Ia318890180132e04180c6d461b04ee046f341358
2017-04-25 21:52:51 +00:00
Tom Cherry d9ebf06117 Merge "init: rename 'Trigger' to 'Event' and convert to std::variant" 2017-04-25 21:44:19 +00:00
Tom Cherry 960ed3ce1b Merge changes I1f70f2c4,I698ca962,Idbbf2682
* changes:
  init: remove unused parts of parser.cpp
  ueventd: replace ueventd_parser.cpp with init_parser.cpp
  init: add Parser::AddSingleLineParser()
2017-04-25 21:44:07 +00:00
Tom Cherry ad6741c6f8 init: remove unused parts of parser.cpp
Now that ueventd is using init's parser, we no longer need anything
other than the tokenizer from parser.cpp.

Test: Boot bullhead
Change-Id: I1f70f2c4479af576174bd74dd919d81817500216
2017-04-25 11:24:33 -07:00
Tom Cherry fe062055cb ueventd: replace ueventd_parser.cpp with init_parser.cpp
Previously init_parser.cpp was made generic and capable of parsing any
number of differently named 'sections' or prefixed lines.  We now use
these capabilities to do the parsing for ueventd.

Bug: 36250207
Bug: 33785894

Test: boot bullhead and ensure the right /dev nodes exist
      with the right permissions set
Test: verify no boot time difference
Change-Id: I698ca962d414f8135af32f6c9cd778841b2b8b53
2017-04-25 11:24:24 -07:00
Wei Wang 0380041304 Merge "Revert "Revert "Ensure update_verifier run before zygote"""
am: 5fe07acd07

Change-Id: I4142f960f8867c4e24815c0cbcb31eaa00e83acc
2017-04-25 17:42:11 +00:00
Treehugger Robot 5fe07acd07 Merge "Revert "Revert "Ensure update_verifier run before zygote""" 2017-04-25 17:34:35 +00:00
Bowgo Tsai 71881fffd6 init: fix first stage mount failure when two fstab entries have verity_loc
The previous check is incorrect because it compares the basename of
previous verity_loc with the full path of current verity_loc.

Changes it to compare the full device file path instead of just the basename
of verity_loc. This can catch the case of two different verity_loc
values with the same basename, e.g.,

  - verify=/dev/block/platform/SOC.0/by-name/metadata
  - verify=/dev/block/platform/SOC.1/by-name/metadata

Bug: 37413399
Bug: 37619597
Test: first stage mount /system and /vendor with the following fs_mgr_flags on bullhead
        - wait,verify=/dev/block/platform/soc.0/f9824900.sdhci/by-name/metadataa
Test: first stage mount /system and /vendor with different verity_loc values
      on bullhead, checks it bails out
Change-Id: I017c8bd9f0790d45e08e57df9a2878e4f62c5f9c
2017-04-26 01:23:19 +08:00
Tom Cherry 35c5bcc89c init: add Parser::AddSingleLineParser()
Add the ability to override the current section being parsed and
instead parse a line by itself if a given line starts with a specific
prefix.

Test: Boot bullhead
Change-Id: Idbbf2682b78996b41d05f3db655c8937a8c6ccda
2017-04-25 10:19:37 -07:00
Tom Cherry 26ed9cb706 init: rename 'Trigger' to 'Event' and convert to std::variant
The term 'trigger' should be used in 'Action' to indicate what causes
the 'Action' to be executed.

The term 'event' should be used in ActionManager's queue to indicate
a state change that is checked against the 'triggers' of an 'Action' to
see if it should execute.

Convert the previous Trigger class to std::variant, as the latter is
better suited for this use.

Change-Id: I2558367c8318b536aa69fcec93793f1c12857ef5
2017-04-25 17:14:23 +00:00
Steven Moreland 01ff125c20 Merge "libsysutils: Android.mk -> Android.bp"
am: d0013343e9

Change-Id: I45eb8746984691971b5370b43c90a2c4db23a26d
2017-04-25 16:35:54 +00:00
Treehugger Robot d0013343e9 Merge "libsysutils: Android.mk -> Android.bp" 2017-04-25 16:32:49 +00:00