Commit graph

32977 commits

Author SHA1 Message Date
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
Wei Wang
b4cf966e42 Merge "Ensure update_verifier run before zygote" into oc-dev am: 40082926b2
am: 9c8b804c24

Change-Id: Id06952abae512bc165555d2c0fb2f706da2a0a05
2017-04-25 23:19:19 +00:00
Wei Wang
9c8b804c24 Merge "Ensure update_verifier run before zygote" into oc-dev
am: 40082926b2

Change-Id: I9cbac7eb2910da96493bf9651ab2e1719d7a3d42
2017-04-25 23:11:22 +00:00
Christopher Ferris
7a9aff5d6e Merge "Add the Dwarf CFA handling." am: 1c036ebc15 am: 897a7b0056 am: 686b9a920c
am: 1ae2307c70

Change-Id: If5908b9d01ea7275001dd2ed3d72e606f7239629
2017-04-25 23:07:35 +00:00
Wei Wang
40082926b2 Merge "Ensure update_verifier run before zygote" into oc-dev 2017-04-25 23:06:09 +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
1ae2307c70 Merge "Add the Dwarf CFA handling." am: 1c036ebc15 am: 897a7b0056
am: 686b9a920c

Change-Id: Ia8ed479c72187676b9a9aec0dec4319a21429f80
2017-04-25 22:45:01 +00:00
Christopher Ferris
686b9a920c Merge "Add the Dwarf CFA handling." am: 1c036ebc15
am: 897a7b0056

Change-Id: I09ebc560d74fec820dabd1ebc4a4179bc79c2104
2017-04-25 22:36:40 +00:00
Christopher Ferris
897a7b0056 Merge "Add the Dwarf CFA handling."
am: 1c036ebc15

Change-Id: I25eb52b3ae10fcf771f5451a28399b03a0b082d7
2017-04-25 22:29:50 +00:00
Tom Cherry
c608a2e796 Merge "init: rename 'Trigger' to 'Event' and convert to std::variant" am: d9ebf06117 am: d45b6f44d5 am: f9557f175c
am: e8b8045f96

Change-Id: I38e9c3d4e3c52902abaa71d40241dbba72867aee
2017-04-25 22:20:41 +00:00
Tom Cherry
0fd168d075 Merge changes I1f70f2c4,I698ca962,Idbbf2682 am: 960ed3ce1b am: 4cd8d5e9f5 am: bfbe459ff1
am: 7bd11f7f1b

Change-Id: Ieb8ae5b5ce95d607815a32facbd842340ea2ea46
2017-04-25 22:20:25 +00:00
Jaekyun Seok
8390e096a5 Merge "Update persist.sys.usb.config on runtime" into oc-dev am: 353c6cd3c3 -s ours
am: cabbe6e7d8  -s ours

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

Change-Id: Ie900559a7b7d1b70aac2b9e52b1a06727348eae8
2017-04-25 21:59:03 +00:00
Tom Cherry
7bd11f7f1b Merge changes I1f70f2c4,I698ca962,Idbbf2682 am: 960ed3ce1b am: 4cd8d5e9f5
am: bfbe459ff1

Change-Id: I90526601990c7d4d3cbd2b8f3a35bf2c4c8a2ef8
2017-04-25 21:58:47 +00:00
Tom Cherry
f9557f175c Merge "init: rename 'Trigger' to 'Event' and convert to std::variant" am: d9ebf06117
am: d45b6f44d5

Change-Id: I3245296dcd06e5aa6daa45d3621fa424c5f5598e
2017-04-25 21:55:33 +00:00
Tom Cherry
bfbe459ff1 Merge changes I1f70f2c4,I698ca962,Idbbf2682 am: 960ed3ce1b
am: 4cd8d5e9f5

Change-Id: I8e3a5dabb003a690b54011e2becf5e6050319dbf
2017-04-25 21:55:14 +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
Jaekyun Seok
cabbe6e7d8 Merge "Update persist.sys.usb.config on runtime" into oc-dev
am: 353c6cd3c3  -s ours

Change-Id: I50f2b5b5564f918bd2cbaaa59bdcce1d4ecbc76f
2017-04-25 21:41:34 +00:00
TreeHugger Robot
353c6cd3c3 Merge "Update persist.sys.usb.config on runtime" into oc-dev 2017-04-25 21:16:09 +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
07fc6421cf Merge "Revert "Revert "Ensure update_verifier run before zygote""" am: 5fe07acd07 am: 0380041304 am: b8fdeb4c5a
am: b0d85903cd

Change-Id: I77a093146a7db8651e6a6bd204ccd97ca2e37412
2017-04-25 17:53:34 +00:00
Wei Wang
53842e7dc6 Ensure update_verifier run before zygote
Currently zygote is started early for FBE device but update_verifier is run later
which creates a potential risk. This CL ensures update_verifier run before
zygote touches anything within data/ partition. With this change, we also start zygote
early for unencrypted/unsupported encryption state device.

Bug: 37543411
Test: marlin boots

(cherry picked from commit 5dc05effec)

Change-Id: I97cde0c20f74b1b17c995d84c2e31c86fe006395
2017-04-25 17:49:22 +00:00
Wei Wang
b0d85903cd Merge "Revert "Revert "Ensure update_verifier run before zygote""" am: 5fe07acd07 am: 0380041304
am: b8fdeb4c5a

Change-Id: Ief5492dd4b08de351c5ef8c72aeb3ffb09f6feff
2017-04-25 17:46:07 +00:00
Wei Wang
b8fdeb4c5a Merge "Revert "Revert "Ensure update_verifier run before zygote""" am: 5fe07acd07
am: 0380041304

Change-Id: If759257825519a09dc71c3e3870561928951f97e
2017-04-25 17:44:35 +00: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
Randy Pan
f098685cc7 Merge "Remove capability setting for legacy_wifi_hal" into oc-dev am: 8ed2e54ce5
am: 9ff5e014bd

Change-Id: Ibfb5913f5269791fa9d6a1f771f10724ece6a2ca
2017-04-25 17:23:46 +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
Randy Pan
9ff5e014bd Merge "Remove capability setting for legacy_wifi_hal" into oc-dev
am: 8ed2e54ce5

Change-Id: I730d7d2f8da7c07981f08a284ea3c2e0f1344d05
2017-04-25 17:20:58 +00: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
Randy Pan
8ed2e54ce5 Merge "Remove capability setting for legacy_wifi_hal" into oc-dev 2017-04-25 16:59:38 +00:00
Steven Moreland
a41a59bcc8 Merge "libsysutils: Android.mk -> Android.bp" am: d0013343e9 am: 01ff125c20 am: adec9f59cd
am: 5129751e39

Change-Id: I1b90816bd3ddf9305705c9ab4a0f0298e96dffd9
2017-04-25 16:49:23 +00:00
Steven Moreland
5129751e39 Merge "libsysutils: Android.mk -> Android.bp" am: d0013343e9 am: 01ff125c20
am: adec9f59cd

Change-Id: I16f1d72b6119147223501f5e79a8b106eb99068e
2017-04-25 16:46:01 +00:00
Steven Moreland
adec9f59cd Merge "libsysutils: Android.mk -> Android.bp" am: d0013343e9
am: 01ff125c20

Change-Id: I191ed9297797e9ab014d00cb96a8c319184e487e
2017-04-25 16:37:56 +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
Erik Staats
b4c4654c7c Change get_sched_policy to check "schedtune" and "cpuset".
get_sched_policy will first attempt to get the policy from the "schedtune"
subsystem cgroup and, if not set, attempt to get the policy from the
"cpuset" subsystem cgroup.  If neither subsystem has a cgroup set,
SP_FOREGROUND is returned.

Bug: 32972117
Test: Verified that SchedPolicy libcutils test passes and that ps displays
the expected policies.  See details in testing done comment in
https://android-review.googlesource.com/379426 .

Change-Id: I586a921a38eea99d65590b07ece96c9808a2e56d
2017-04-25 15:26:53 +00:00
Andreas Gampe
c7c2d7bcd4 Linker: Add ASAN support to treble ld.config
Add asan counterparts.

Bug: 37579959
Test: m && m SANITIZE_TARGET=address
Merged-in: I23f05436b79fbcb3f6fa11d84c95fcd180fad3b3
Change-Id: I23f05436b79fbcb3f6fa11d84c95fcd180fad3b3
2017-04-25 21:59:37 +09:00
Jaekyun Seok
03bcaec5a0 Update persist.sys.usb.config on runtime
persist.sys.usb.config values can't be combined on build-time when
property files are split into each partition.
So we need to apply the same rule of
build/make/tools/post_process_props.py on runtime.

Test: building succeeded and tested on sailfish.
Bug: 37617113
Bug: 37648659
Merged-In: If1e4279f05d74eccf5ce23eef41a466b7d8e3bde
Merged-In: I1e5ad9da360bfb3cb4970e12a76522fd0a5126b8

Change-Id: I78cdffee446d3ae6a89f138faed5f3149e4b507d
(cherry picked from commit 0cf3a07e14)
2017-04-25 16:21:43 +09:00
Jaekyun Seok
e83b252a9c Merge "Update persist.sys.usb.config on runtime" am: 41346e553b am: ac945881b3 am: 33e7e21645
am: 01d4504a6c

Change-Id: If1e4279f05d74eccf5ce23eef41a466b7d8e3bde
2017-04-25 04:04:35 +00:00
Jaekyun Seok
01d4504a6c Merge "Update persist.sys.usb.config on runtime" am: 41346e553b am: ac945881b3
am: 33e7e21645

Change-Id: I1e5ad9da360bfb3cb4970e12a76522fd0a5126b8
2017-04-25 04:02:35 +00:00
Jaekyun Seok
33e7e21645 Merge "Update persist.sys.usb.config on runtime" am: 41346e553b
am: ac945881b3

Change-Id: I32d78d88863fdae54663b5177d450a0c8d037ae1
2017-04-25 04:00:35 +00:00
Jaekyun Seok
ac945881b3 Merge "Update persist.sys.usb.config on runtime"
am: 41346e553b

Change-Id: I950b791f00fbbb72dca2154df7ea8dc055373257
2017-04-25 03:58:33 +00:00