summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove FuseBridgeLoop class.Daichi Hirono2016-11-162-23/+8
| | | | | | Bug: 32779923 Test: libappfuse_test Change-Id: I29a76701d141ae061ec1fe32993d27460a0c694a
* Stops the loop when all files are closed.Daichi Hirono2016-11-162-4/+28
| | | | | | | | | | The CL changes FuseBridgeLoop so that it exits when all files opened on the AppFuse mount point are closed. Note that the client code will unmount the FUSE mount point after the loop exits. Bug: 32260320 Test: libappfuse_test Change-Id: I4965fbb48de8a280c6306e70757a07376b1956a7
* Merge "Update to new minui text API"Tao Bao2016-11-151-3/+3
|\
| * Update to new minui text APIDamien Bargiacchi2016-11-151-3/+3
| | | | | | | | | | Change-Id: Ic753564a397b90a9ba54660c78bec9c1a1ef583d (cherry picked from commit 0ee524de689e27379eaa3d0af0152183b844b0e8)
* | Merge "Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available."Treehugger Robot2016-11-152-11/+6
|\ \
| * | Use FUSE_COMPAT_22_INIT_OUT_SIZE always if available.Daichi Hirono2016-11-152-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We return the minor version number 15 to FUSE_INIT since we don't handle BATCH_FORGET. Thus the kernel does not accept the latest size of fuse_init_out. Instead we need to use FUSE_COMPAT_22_INIT_OUT_SIZE. Bug: 32779923 Test: libappfuse_test Change-Id: I5c979d0e45344ca8adfe3ad3f4a9561442abcb3a
* | | Merge "init: fix memory leaks"Treehugger Robot2016-11-152-8/+16
|\ \ \
| * | | init: fix memory leaksTing-Yuan Huang2016-11-152-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that node is not freed before return. Test: make WITH_TIDY=1 mmma system/core/init Change-Id: I648eea9dda006d2b2239e169785190817ad31352
* | | | Merge "toolbox: fix memory leak"Treehugger Robot2016-11-151-0/+1
|\ \ \ \
| * | | | toolbox: fix memory leakTing-Yuan Huang2016-11-151-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | free img Test: make WITH_TIDY=1 mmma system/core/toolbox Change-Id: I2f8feff0eddca763ee4e7fc9867480af60c8a911
* | | | Merge "liblog: logprint: report truncated event log contents if error"Mark Salyzyn2016-11-152-58/+57
|\ \ \ \ | |_|_|/ |/| | |
| * | | liblog: logprint: report truncated event log contents if errorMark Salyzyn2016-11-152-58/+57
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to accept that a log tag can contain no payload. For those that are corrupted, and to aid debugging, report what we did manage to interpret. Report last character as a ! for corruption, and ^ for truncation. Fix a few Android Coding standard issues. Test: gTest logcat-unit-tests Bug: 32903864 Change-Id: Id11bef3a7b6569305c51701dd66c45d2038d6628
* | | Merge "ziparchive: Allow ExtractEntryToFile() to work with block device."Tao Bao2016-11-152-6/+17
|\ \ \
| * | | ziparchive: Allow ExtractEntryToFile() to work with block device.Tao Bao2016-11-152-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileWriter::Create() calls ftruncate(2) to truncate the destination file, which doesn't work with FD that references a block device. It leads to kIoError when calling ExtractEntryToFile() to extract an entry to block device FD. As a result, it fails the package_extract_file() command in OTA updates (e.g. 'package_extract_file("boot.img", "/dev/block/platform/soc.0/f9824900.sdhci/by-name/boot")'). This CL skips the call to ftruncate(2) if FD references a block device. Bug: 32903624 Test: ziparchive-tests works. Test: Build an OTA updater (m updater) and call package_extract_file(). Change-Id: Ia81116f1a8d7cab802396bdc32c6096b4cb56a3c
* | | | Merge "Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for."Elliott Hughes2016-11-157-32/+35
|\ \ \ \
| * | | | Switch fastboot/init/libprocessgroup to std::this_thread::sleep_for.Elliott Hughes2016-11-147-32/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/32878766 Test: boots Change-Id: Ie0ddfb7e60f2da5f6eefbb10c83a92e88c137ae3
* | | | | Merge "init: fix BuildTriggersString for empty string"Treehugger Robot2016-11-151-1/+3
|\ \ \ \ \
| * | | | | init: fix BuildTriggersString for empty stringWei Wang2016-11-141-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behavior is undefined if pop_back() on empty std::string Test: grep init log Bug: 32712851 Bug: 32838381 Change-Id: I5bfac2fb275036abd0158b78df14019d2e82716d
* | | | | Merge "Revert "init: warn slow action""Treehugger Robot2016-11-151-5/+3
|\ \ \ \ \
| * | | | | Revert "init: warn slow action"Nick Desaulniers2016-11-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b1a309ac1f08df9864ba2c364225a6bb172fd003. Bug: 32712851 Bug: 32838381 Change-Id: Ib4c47de5ea5b0bad765a43cbff9f73d9978729d4
* | | | | | Merge "Add static assert to check if FuseBuffer is standard layout union."Treehugger Robot2016-11-142-16/+26
|\ \ \ \ \ \
| * | | | | | Add static assert to check if FuseBuffer is standard layout union.Daichi Hirono2016-11-142-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 32260320 Test: libappfuse_test Change-Id: I6430c11fdeb2405996410c97044b4260c25209b8
* | | | | | | Merge "Add FuseAppLoop to libappfuse."Treehugger Robot2016-11-1410-49/+678
|\| | | | | |
| * | | | | | Add FuseAppLoop to libappfuse.Daichi Hirono2016-11-1410-49/+678
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class is used at the app side (StorageManager) to parse FUSE commands. Bug: 32260320 Test: libappfuse_test Change-Id: I1ae2904d3290a041f1efbf8fc10ba032eda5449c
* | | | | | Merge "libprocinfo: introduce."Josh Gao2016-11-145-0/+386
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | libprocinfo: introduce.Josh Gao2016-11-145-0/+386
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new library for parsing /proc files. Start with helpers for parsing /proc/<pid>/status and /proc/<pid>/task. Bug: http://b/30705528 Test: libprocinfo_test32/64 on host/bullhead Change-Id: I5757514c0aede8a9d75834b55aae42a5cf762b95
* | | | | Merge "Switch ueventd to sendfile(2)."Elliott Hughes2016-11-141-110/+58
|\ \ \ \ \
| * | | | | Switch ueventd to sendfile(2).Elliott Hughes2016-11-141-110/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/32826495 Test: booted and checked dmesg Change-Id: Idfd813dfe6f512fdbc05b1411c7960e950e2f59b
* | | | | | Merge "init start time tracking."Elliott Hughes2016-11-148-96/+120
|\ \ \ \ \ \
| * | | | | | init start time tracking.Elliott Hughes2016-11-128-96/+120
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, init sets a property "init.start" to show the CLOCK_BOOTTIME time at which init itself started, and for each service an "init.svc.<name>.start" property to show the CLOCK_BOOTTIME time at which that service was most recently started. These times can be used by tools like bootstat to track boot time. As part of this change, move init over to std::chrono. Also, rather than make the command-line argument handling more complex, I've switched to using an environment variable for communication between first- and second-stage init, and added another environment variable to pass the start time of the first stage through to the second stage. Bug: http://b/32780225 Test: manual Change-Id: Ia65a623e1866ea688b9a5433d6507926ce301dfe
* | | | | | Merge "Revert "Use process_vm_readv to read memory.""Christopher Ferris2016-11-141-12/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Revert "Use process_vm_readv to read memory."Christopher Ferris2016-11-101-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 279843e1397aff2aedb5e5ffe513893fa1f6767f. Bug: 32806783 Change-Id: I61df26d979a8139a571ff5a6442fb5499ca20547 Test: Verified that the stack and read data works with the revert.
* | | | | | Merge "fix swapped min / max in priority parsing"Treehugger Robot2016-11-121-2/+2
|\ \ \ \ \ \
| * | | | | | fix swapped min / max in priority parsingKeun-young Park2016-11-111-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This error led into not handling highest priority, which made zygote's priority boost no-op bug: 32718256 Test: check init log during bootup Change-Id: I959eb94912a9c1d95bfdb98ee675fdd12cf85699
* | | | | | Merge "crasher: add option to wait for input before crashing."Treehugger Robot2016-11-111-1/+7
|\ \ \ \ \ \
| * | | | | | crasher: add option to wait for input before crashing.Josh Gao2016-11-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful for tests that want to do things with crasher's pid before it crashes. Bug: http://b/30705528 Test: crasher wait-abort; crasher wait-thread-abort Change-Id: I8ba826094dc304d6cd0e6ab088e5cfdb35d2007b
* | | | | | | Merge "Implement Reboot bootloader via bootloader_message"Treehugger Robot2016-11-091-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Implement Reboot bootloader via bootloader_messageVineela Tummalapalli2016-11-081-0/+9
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Write reboot bootloader message to misc - Clarify naming for reboot to recovery BUG: https://issuetracker.google.com/issues/32474515 Change-Id: I4e42509bfcf572e37c8fc070d6571afe406a48b6 Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Reviewed-on: https://android.intel.com/548494
* | | | | | | Merge "init: warn slow action"Treehugger Robot2016-11-091-3/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | init: warn slow actionWei Wang2016-11-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slow action that takes longer than 50ms will be warned to user Test: grep init log Bug: 32712851 Change-Id: I3a6a881a8dee1807270343b511a47c76dd230392
* | | | | | Merge "Start update_verifier in cache group"Tianjie Xu2016-11-091-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Start update_verifier in cache groupTianjie Xu2016-11-091-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start update_verifier in cache group to avoid dac_override Bug: 30020920 Change-Id: I227b4a0e1c07e7b9bf209b432e9db02275ffe660 Test: mma (cherry picked from commit 1e4635f0a8c307592b015476bc69ee2da28c41af)
* | | | | Merge "liblog: android_closeEventTagMap pointer check"Treehugger Robot2016-11-091-1/+1
|\ \ \ \ \
| * | | | | liblog: android_closeEventTagMap pointer checkMark Salyzyn2016-11-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to c/278768 where failure to open tag map can result in segment violation in android_closeEventTagMap. Add check for pointer value = -1 to bypass call to close. Test: gTest liblog-unit-tests, logcat-unit-tests & logd-unit-tests Bug: 30963384 Bug: 31456426 Change-Id: I20547e55d7e29682fde4538bc1fc6d83b4535d49
* | | | | Merge "init: errno handling in create_file"Treehugger Robot2016-11-091-43/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | init: errno handling in create_fileMark Salyzyn2016-11-091-43/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save errno before resetting global context. Use unique_fd. Test: gTest init_tests Bug: 32450474 Change-Id: If45eeaebc3ae379f84bf3ffa3c40194043191854
* | | | Merge "fs_mgr: fix clang static analyzer warning"Treehugger Robot2016-11-083-12/+17
|\ \ \ \
| * | | | fs_mgr: fix clang static analyzer warningJin Qian2016-11-083-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pointer from strdup is lost hence triggers mem leak warning from clang, since ptr returned from basename may not point to start of duplicated string any more. Switch to use gnu version of basename which doesn't modify input string so that strdup is no longer necessary. Bug: 27126348 Change-Id: Iadb5cf343437a1e27e588ee067b084897633ea07 Merged-In: I937a68c01c223230932c932bffdd35da6503c3c4
* | | | | Merge changes I93a1c003,I283fec89Mark Salyzyn2016-11-076-87/+581
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | * changes: liblog: logcat: logprint support -v descriptive liblog: add android_lookupEventFormat_len
| * | | | liblog: logcat: logprint support -v descriptiveMark Salyzyn2016-11-044-75/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand logprint feature to pull out the log tag description fields, parse them and merge into the logging content. Add -v descriptive, -v colour(british, hidden) and -v help. Also added a unit test for the descriptive format borrowing from event tags that have been unchanged since 2009. Had to add -v help because we have too many undocumented formats and format adverbs. Test: gTest logcat-unit-tests --gtest_filter=logcat.descriptive Bug: 31456426 Change-Id: I93a1c003b7a3f4c332544946fdedb7277919cec3