summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lmkd: Android.mk -> Android.bpSteven Moreland2017-04-282-12/+13
| | | | | Test: links Change-Id: I19aa62270488af02d64830ca90faf80b35423009
* Merge "libbinderwrapper: Android.mk -> Android.bp"Treehugger Robot2017-04-262-62/+61
|\
| * libbinderwrapper: Android.mk -> Android.bpSteven Moreland2017-04-252-62/+61
| | | | | | | | | | | | Test: links Change-Id: I63332b8d02f8499b165b4069a8c88e459f276f90
* | Merge "set default shutdown timeout to 6 secs"Keun-young Park2017-04-261-2/+1
|\ \
| * | set default shutdown timeout to 6 secsKeun-young Park2017-04-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "do not start shutdown animation from init"Treehugger Robot2017-04-261-9/+0
|\ \ \ | |/ / |/| |
| * | do not start shutdown animation from initKeun-young Park2017-04-191-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | - init will only keep animation related services as shutdown critical. - external component like system server can start shutdown animation. bug: 37500823 Test: reboot Change-Id: Ief328306eba7e3b15402ae27e6236767095f508c
* | | Merge "add additional dump for timeout"Keun-young Park2017-04-261-3/+7
|\ \ \
| * | | add additional dump for timeoutKeun-young Park2017-04-261-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Merge changes Ibe91fd2d,I59e2bd9eTreehugger Robot2017-04-261-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: init: remove 'computing context for service'... message init: use full command for exec services' names
| * | | | init: remove 'computing context for service'... messageTom Cherry2017-04-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | init: use full command for exec services' namesTom Cherry2017-04-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Allow Bluetooth HAL CAP_SYS_NICE"Philip Cuadra2017-04-261-2/+4
|\ \ \ \ \
| * | | | | Allow Bluetooth HAL CAP_SYS_NICEPhilip Cuadra2017-04-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bluetooth HAL has threads that process Bluetooth audio. They need to be scheduled as RT priority, so allow the Bluetooth HAL to set its threads to RT scheduling. Bug 37518404 Test: play Bluetooth audio, confirm priority via systrace Change-Id: I4928cf182a0805c0714e4d073cba15c864fbe328
* | | | | | Merge "Change get_sched_policy to check "schedtune" and "cpuset"."Erik Staats2017-04-261-18/+18
|\ \ \ \ \ \
| * | | | | | Change get_sched_policy to check "schedtune" and "cpuset".Erik Staats2017-04-251-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "logd: add Chattiest LOG_TAG statistics"Treehugger Robot2017-04-262-23/+253
|\ \ \ \ \ \ \
| * | | | | | | logd: add Chattiest LOG_TAG statisticsMark Salyzyn2017-04-242-23/+253
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report global LOG_TAG usage. Switch NULL to nullptr and use const more accurately. Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-tests Test: manual: inspect logcat -S results around 'Chattiest TAGs' Test: logcat -b all -c ; logcat -b all -S ; then confirm clear Bug: 37254265 Change-Id: I3696c0d8da3ba24f99f670aafba1e45f8cb3ab14
* | | | | | | Merge "init: fix first stage mount failure when two fstab entries have ↵Treehugger Robot2017-04-261-13/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | verity_loc"
| * | | | | | | init: fix first stage mount failure when two fstab entries have verity_locBowgo Tsai2017-04-261-13/+12
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Add the Dwarf CFA handling."Christopher Ferris2017-04-257-0/+2837
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add the Dwarf CFA handling.Christopher Ferris2017-04-247-0/+2837
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23762183 Test: Ran new unit tests. Change-Id: I31abac1238cc671b78a505da655fb6298be072b4
* | | | | | Merge "init: rename 'Trigger' to 'Event' and convert to std::variant"Tom Cherry2017-04-253-68/+34
|\ \ \ \ \ \
| * | | | | | init: rename 'Trigger' to 'Event' and convert to std::variantTom Cherry2017-04-253-68/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge changes I1f70f2c4,I698ca962,Idbbf2682Tom Cherry2017-04-2515-457/+242
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: init: remove unused parts of parser.cpp ueventd: replace ueventd_parser.cpp with init_parser.cpp init: add Parser::AddSingleLineParser()
| * | | | | | | init: remove unused parts of parser.cppTom Cherry2017-04-253-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | ueventd: replace ueventd_parser.cpp with init_parser.cppTom Cherry2017-04-2511-411/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | init: add Parser::AddSingleLineParser()Tom Cherry2017-04-252-12/+34
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Revert "Revert "Ensure update_verifier run before zygote"""Treehugger Robot2017-04-251-8/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Revert "Revert "Ensure update_verifier run before zygote""Wei Wang2017-04-241-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2de3344180f0308a8e8c9ffa533bbd572e6fd89d. Change-Id: Ifc49bf389ed43a56baf5bb55d5f2028b8725083d
* | | | | | | Merge "libsysutils: Android.mk -> Android.bp"Treehugger Robot2017-04-252-27/+25
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | libsysutils: Android.mk -> Android.bpSteven Moreland2017-04-242-27/+25
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Test: links Change-Id: If1d034ecb880e8c41d58b14ebebcda5b72e88424
* | | | | | Merge "Update persist.sys.usb.config on runtime"Treehugger Robot2017-04-251-0/+19
|\ \ \ \ \ \
| * | | | | | Update persist.sys.usb.config on runtimeJaekyun Seok2017-04-251-0/+19
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I78cdffee446d3ae6a89f138faed5f3149e4b507d
* | | | | | Merge "init: set ro.boot.avb_version in recovery mode"Treehugger Robot2017-04-253-4/+60
|\ \ \ \ \ \
| * | | | | | init: set ro.boot.avb_version in recovery modeBowgo Tsai2017-04-243-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we set ro.boot.avb_version during the first stage mount in normal mode: - https://android-review.googlesource.com/#/c/371774/ As the first stage mount is not performed in recovery mode, we need to set the property separately in recovery mode. Bug: 37414003 Test: first stage mount /vendor with vboot 2.0 (avb) on bullhead in normal mode Test: first stage mount /system with without verity on bullhead in normal mode Test: checks ro.boot.avb_version is 1.0 on bullhead in recovery mode Test: first mount /vendor with with vboot 1.0 on sailfish in normal mode Test: checks ro.boot.avb_version doesn't exist on sailfish in recovery mode Change-Id: I262e75b8b557c4de7609b4049ccb01793644245e
* | | | | | | Merge "init: moving early mount logic into init_first_stage.cpp"Treehugger Robot2017-04-257-351/+442
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | init: moving early mount logic into init_first_stage.cppBowgo Tsai2017-04-247-351/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also renames "early mount" to "first stage mount" to prevent confusion with "mount_all --early", which is run in the init second stage. Also creates a base class: FirstStageMount and two derived classes: FirstStageMountVBootV1 and FirstStageMountVBootV2 to replace/refactor existing functions: - early_mount() -> DoFirstStageMount() and FirstStageMount::DoFirstStageMount() - vboot_1_0_early_partitions -> FirstStageMountVBootV1::GetRequiredDevices() - vboot_2_0_early_partitions -> FirstStageMountVBootV2::GetRequiredDevices() - vboot_1_0_mount_partitions -> FirstStageMount::MountPartitions() and FirstStageMountVBootV1::SetUpDmVerity() - vboot_2_0_mount_partitions -> FirstStageMount::MountPartitions() and FirstStageMountVBootV2::SetUpDmVerity() Bug: 37413399 Test: first stage mount /vendor with vboot 2.0 (avb) on bullhead Test: first stage mount /system with without verity on bullhead Test: first stage mount /vendor with with vboot 1.0 on sailfish Change-Id: I6584bdf7d832c9fbc8740f97c9b8b94e68a90783
* | | | | | Merge "Revert "logd: add Chattiest LOG_TAG statistics""Mark Salyzyn2017-04-242-230/+5
|\ \ \ \ \ \
| * | | | | | Revert "logd: add Chattiest LOG_TAG statistics"Mark Salyzyn2017-04-242-230/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 903156ddaaad85f89210d809dddc17a9000342a4. Test: compile Bug: 37254265 Change-Id: If9af79684119861ceecf4f88a4a4c84f991b188a
* | | | | | | Merge changes Ic446c026,I86568a5bTom Cherry2017-04-2415-100/+312
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: init: create init_tests.cpp init: clean up the SectionParser interface and Parser class
| * | | | | | init: create init_tests.cppTom Cherry2017-04-218-28/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start a init_tests.cpp file for end-to-end tests that parse small init script segments and verify that they act as expected. The first tests ensure that the execution order of event triggers happens appropriately. Test: Boot bullhead, run unit tests Change-Id: Ic446c02605ab796fd41e0596ce1fd381aee80ce0
| * | | | | | init: clean up the SectionParser interface and Parser classTom Cherry2017-04-2111-72/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the dependency on Action and Service from what should be a generic Parser class. Make ActionParser, ImportParser, and ServiceParser take a pointer to their associated classes instead of accessing them through a singleton. Misc fixes to SectionParser Interface: 1) Make SectionParser::ParseLineSection() non-const as it always should have been. 2) Use Rvalue references where appropriate 3) Remove extra std::string& filename in SectionParser::EndFile() 4) Only have SectionParser::ParseSection() as pure virtual Document SectionParser. Make ImportParser report the filename and line number of failed imports. Make ServiceParser report the filename and line number of duplicated services. Test: Boot bullhead Change-Id: I86568a5b375fb4f27f4cb235ed1e37635f01d630
* | | | | | | Merge "logd: add Chattiest LOG_TAG statistics"Treehugger Robot2017-04-242-5/+230
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | logd: add Chattiest LOG_TAG statisticsMark Salyzyn2017-04-212-5/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report global LOG_TAG usage. Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-tests Test: manual: inspect logcat -S results around 'Chattiest TAGs' Bug: 37254265 Change-Id: I32473a1d9131c87e4fb7841d5cc0ea9cc14c63cd
* | | | | | Merge "Revert "Make the xtables lock readable only by AID_RADIO and root.""Lorenzo Colitti2017-04-221-1/+0
|\ \ \ \ \ \
| * | | | | | Revert "Make the xtables lock readable only by AID_RADIO and root."Lorenzo Colitti2017-04-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e801e7bd52d890583f44dffc41116c2dbc2a770. The file permissions don't allow access to the lock on devices where vendor code runs with UID root and GID radio. They are no longer necessary because we have a more flexible selinux-based solution in https://android-review.googlesource.com/#/c/354223/ . Test: strace -f -e flock -p <netmgrd_pid> on angler shows flock succeeds Test: strace -f -e flock -p <netmgrd_pid> on marlin shows flock succeeds Test: netd_unit_test passes on marlin Test: strace -f -e flock -p <netd_pid> on marlin shows flock succeeds Bug: 36108349 Bug: 37483189 Change-Id: Ia1bbf8d93ec6777514be66cbd1a32dfc95df95c0
* | | | | | | Merge "Revert "Ensure update_verifier run before zygote""Keun-young Park2017-04-221-21/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Revert "Ensure update_verifier run before zygote"Keun-young Park2017-04-221-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5dc05effecca88f06da090dbcdd257666e69c2c7. Change-Id: Ic041860dee8a2993c6b4890beca4da745cfbfb60
* | | | | | Merge "Ensure update_verifier run before zygote"Treehugger Robot2017-04-211-8/+21
|\| | | | | | |_|/ / / |/| | | |