summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "logd: logcat --clear respect pruneMargin" am: 3d0186b97e am: daae7558e8Mark Salyzyn2017-05-152-32/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 96ab6a71fa Change-Id: Ic52878dc55b1bc2ce277a2d2e34d854c6bfc136e
| * | | | | | | | | Merge "logd: logcat --clear respect pruneMargin" am: 3d0186b97eMark Salyzyn2017-05-152-32/+38
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: daae7558e8 Change-Id: I7fc1b18b080083fd7a48b1bcec8ec8e11139d4d2
| | * | | | | | | | Merge "logd: logcat --clear respect pruneMargin"Mark Salyzyn2017-05-152-32/+38
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3d0186b97e Change-Id: If4e8c488530dc4ef20129806c5c84ffb68d0a40b
| | | * | | | | | | Merge "logd: logcat --clear respect pruneMargin"Treehugger Robot2017-05-152-32/+38
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | logd: logcat --clear respect pruneMarginMark Salyzyn2017-05-152-32/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While a reader is present, consider it a success, and not busy, if a buffer is pruned down to pruneMargin plus one second of additional margin of logspan. If not busy, no need to trigger any mitigations regarding the readers, or to report any errors. Side Effects are we no longer mitigate the reader when performing chatty filtration. This is a positive side effect because we were getting --wrap wakeups that seemed premature. Add kickMe() and isBusy() methods to ease maintenance and uniformity of actions. Test: gTest liblog-unit-tests, logd-unit-tests & logcat-unit-tests Test: manual: 'logcat -b all -c' repeat in a loop, at various logging load levels, simultaneously 'logcat -b' all in another session. Bug: 38046067 Change-Id: I3d0c8a2d416a25c45504eda3bfe70b6f6e09ab27
* | | | | | | | | | | Merge "fastboot: Add DTS partition support for 'flashall' command" am: ↵Dmitry Shmidt2017-05-151-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8e428110b am: 0f0ee1beeb am: 12f0bb3395 Change-Id: I679936f6992417406ab019950f158d526a371730
| * | | | | | | | | | Merge "fastboot: Add DTS partition support for 'flashall' command" am: ↵Dmitry Shmidt2017-05-151-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8e428110b am: 0f0ee1beeb Change-Id: I12167075a299517f582333c3cc7e88cafa74b80e
| | * | | | | | | | | Merge "fastboot: Add DTS partition support for 'flashall' command"Dmitry Shmidt2017-05-151-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b8e428110b Change-Id: I80bd3be921d7091ad9d5d7e1b3f1cb4cc03084a6
| | | * | | | | | | | Merge "fastboot: Add DTS partition support for 'flashall' command"Treehugger Robot2017-05-151-0/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | / / / | | | | | |_|_|/ / / | | | | |/| | | | |
| | | | * | | | | | fastboot: Add DTS partition support for 'flashall' commandDmitry Shmidt2017-05-151-0/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hikey960 has DTS partiton for DT image Test: Manual Bug: 38310807 Change-Id: I9f8e9b27ed40ebdd225f3c4e4b30f53e7cdb5ee7 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | | Merge changes I0ff1fc5c,I7a23d3bf into oc-devJosh Gao2017-05-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7172f41b8 Change-Id: I666faf401fb86b4a74c610abfc39b673b103856b
| * | | | | | | | Merge changes I0ff1fc5c,I7a23d3bf into oc-devTreeHugger Robot2017-05-124-27/+47
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: libdebuggerd: print the build fingerprint in fallback. libdebuggerd: implement fallback register dumping on arm/aarch64.
| | * | | | | | | | libdebuggerd: print the build fingerprint in fallback.Josh Gao2017-05-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/37798209 Test: killall -ABRT media.codec on internal Change-Id: I0ff1fc5ca1e0bcec2c1b2553d6af7099deebfeda (cherry picked from commit 62f5977d4a116addb80fe31c51e8b560a92ea6d7)
| | * | | | | | | | libdebuggerd: implement fallback register dumping on arm/aarch64.Josh Gao2017-05-104-27/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/35439781 Test: killall -ABRT media.codec on internal Change-Id: I7a23d3bfcf07ad584e677b2ef5fff28436ef0972 (cherry picked from commit 77b00ed429a66d0943f0b6af0b57f08577816fe3)
* | | | | | | | | | Merge "Add libkeyutils." am: 81824ebf1f am: dce08d5572Elliott Hughes2017-05-128-51/+197
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 971e77c5c0 Change-Id: Ibe5aa5bfca03727c3c1d1dbee8941c451d76885f
| * | | | | | | | | Merge "Add libkeyutils." am: 81824ebf1fElliott Hughes2017-05-128-51/+197
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dce08d5572 Change-Id: I5bcbf12878291488ec9a141009e6a2846b86d34f
| | * | | | | | | | Merge "Add libkeyutils."Elliott Hughes2017-05-128-51/+197
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 81824ebf1f Change-Id: I096f8f0333313ca1425d6d285b07b9c199c1d90e
| | | * | | | | | | Merge "Add libkeyutils."Elliott Hughes2017-05-128-51/+197
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | Add libkeyutils.Elliott Hughes2017-05-108-51/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move init over to it. Bug: http://b/37991155 Test: builds+boots Change-Id: I5113a9d96a5ce0a0f3bad71134d6cc4f7b41a57e
* | | | | | | | | | Merge "debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id." ↵Josh Gao2017-05-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: f9b9802ce9 -s ours Change-Id: I36a9ece869ff3059e0aba605a9dc97e40f9ae04d
| * | | | | | | | | Merge "debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id." ↵Josh Gao2017-05-122-8/+50
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | into oc-dev
| | * | | | | | | | debuggerd_handler: use syscall(__NR_get[pt]id) instead of get[pt]id.Josh Gao2017-05-102-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic's cached values for getpid/gettid can be invalid if the crashing process manually invoked clone to create a thread or process, which will lead the crash_dump refusing to do anything, because it sees the actual values. Use the getpid/gettid syscalls directly to ensure correct values on this end. Bug: http://b/37769298 Test: debuggerd_test Change-Id: I0b1e652beb1a66e564a48b88ed7fa971d61c6ff9 (cherry picked from commit 2e7b8e2d1aff139895127a93c020bddb98a0f26e)
* | | | | | | | | | Merge "liblog: tests: crashes in logcat.descriptive" am: f218210f6e am: ↵Mark Salyzyn2017-05-121-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 236daaf478 am: 3de904a826 Change-Id: I9e628c4fcbf2a2bef82d66a3af510524e72ce95e
| * | | | | | | | | Merge "liblog: tests: crashes in logcat.descriptive" am: f218210f6eMark Salyzyn2017-05-121-4/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 236daaf478 Change-Id: I3f6154e833e5da809a36ee478a4500effa8ff3ef
| | * | | | | | | | Merge "liblog: tests: crashes in logcat.descriptive"Mark Salyzyn2017-05-121-4/+4
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f218210f6e Change-Id: I4efdd4e727d32f06f2c352c0c211cc51b5bbe0e9
| | | * | | | | | | Merge "liblog: tests: crashes in logcat.descriptive"Treehugger Robot2017-05-121-4/+4
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | | * | | | | | liblog: tests: crashes in logcat.descriptiveMark Salyzyn2017-05-121-4/+4
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scanTagLine has some loops that do not check for a terminating nul, problematic for responses from the logger via __getEventTag. Test: gTest logcat-unit-tests --gtest_filter=*.descriptive Bug: 37791296 Change-Id: Ib4e900b765b407bdee43e009d6625fe289863ddc
* | | | | | | | | Revert "disable module loading after BOOT_COMPLETED broadcast"Steve Muckle2017-05-121-6/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f59c55aa7a Change-Id: Ib871ab1f2005c074dad0dd207e4dc41bd35568d6
| * | | | | | | | Revert "disable module loading after BOOT_COMPLETED broadcast"Steve Muckle2017-05-101-6/+0
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ed19d1675ab7a9b45d1b82c90aac2be8f408a2e. Allow devices to decide for themselves whether to allow module loading after boot. Bug: 38204366 Test: boot sailfish, load a kernel module Change-Id: Ib9e77381de9003fb5160463664015a95316ddfc5
* | | | | | | | Merge "Enable libprocessgroup on host bionic" am: 44673da3eb am: ee178d6976Tom Cherry2017-05-111-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b0f3d9f6a Change-Id: Idf7e0b4b6ee104f37d8b05b0e8ea7792aa63317d
| * | | | | | | Merge "Enable libprocessgroup on host bionic" am: 44673da3ebTom Cherry2017-05-111-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ee178d6976 Change-Id: I76bbef92d234233c1ced1ea6bf8af592584213bf
| | * | | | | | Merge "Enable libprocessgroup on host bionic"Tom Cherry2017-05-111-0/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 44673da3eb Change-Id: I88fed3b3b93d3102fa6322b2254e18fffe350d51
| | | * | | | | Merge "Enable libprocessgroup on host bionic"Treehugger Robot2017-05-111-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Enable libprocessgroup on host bionicTom Cherry2017-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31559095 Test: Build Change-Id: I1ee9fb492137c6c16f0d02586393837616127972
* | | | | | | | | Merge "fs_mgr: Update for new libavb API." am: 5ed7d39857 am: fb4d8b0bacDavid Zeuthen2017-05-113-6/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 91f1bf78b0 Change-Id: I9ec32d93fa3484b4dc7eb40344390186435a6786
| * | | | | | | | Merge "fs_mgr: Update for new libavb API." am: 5ed7d39857David Zeuthen2017-05-113-6/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fb4d8b0bac Change-Id: I551f4cea142e70db7eb88eaaa86cd3c7afc6897c
| | * | | | | | | Merge "fs_mgr: Update for new libavb API."David Zeuthen2017-05-113-6/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5ed7d39857 Change-Id: Iaccfaae0cc8884ef6352c4c338690a31a8d18f75
| | | * | | | | | Merge "fs_mgr: Update for new libavb API."Treehugger Robot2017-05-113-6/+11
| | | |\ \ \ \ \ \
| | | | * | | | | | fs_mgr: Update for new libavb API.David Zeuthen2017-05-103-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://android-review.googlesource.com/#/c/392873/ we slightly changed the libavb API. This CL updates fs_mgr to use the new API. Bug: 38157502 Test: Manually tested. Change-Id: Ia3371e11fcd81fcc1d147f030cd62af67943aad5
* | | | | | | | | | Merge "Fix "fastboot oem"." am: dbe9ab1074 am: c9d545855aElliott Hughes2017-05-111-5/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8bb2503c78 Change-Id: I8e5854829bd1a85de9ba2f074f3e7eb5098fe70e
| * | | | | | | | | Merge "Fix "fastboot oem"." am: dbe9ab1074Elliott Hughes2017-05-111-5/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c9d545855a Change-Id: I22af3acd882355fd096d3e6078fe7fb6aa8ce2b1
| | * | | | | | | | Merge "Fix "fastboot oem"."Elliott Hughes2017-05-111-5/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dbe9ab1074 Change-Id: I71c0d2eceaf4153f853196d07688558b3979a033
| | | * | | | | | | Merge "Fix "fastboot oem"."Treehugger Robot2017-05-111-5/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix "fastboot oem".Elliott Hughes2017-05-111-5/+3
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by d6365a70527275f700b9594452020715a0c52510. Bug: https://issuetracker.google.com/38216236 Test: "fastboot oem uart enable" Change-Id: I672d5b96bb16fd77e7af61115b8a38606c691ea8
* | | | | | | | | | Merge "logd: validate and fill in socket credentials" am: 17254f59a2 am: ↵Mark Salyzyn2017-05-118-9/+90
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1423041905 am: b3b67adafd Change-Id: Id0f6c9df1a48215be1812e39903a55eeaccff969
| * | | | | | | | | Merge "logd: validate and fill in socket credentials" am: 17254f59a2Mark Salyzyn2017-05-118-9/+90
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1423041905 Change-Id: I80c1ec043d288ae037a208702c639acf0042fc27
| | * | | | | | | | Merge "logd: validate and fill in socket credentials"Mark Salyzyn2017-05-118-9/+90
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 17254f59a2 Change-Id: I987d058e7245f5cb9a3603b3f52f7fa947d5dea7
| | | * | | | | | | Merge "logd: validate and fill in socket credentials"Treehugger Robot2017-05-118-9/+90
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | logd: validate and fill in socket credentialsMark Salyzyn2017-05-118-9/+90
| | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - android::pidToUid() additional checking. Make sure if we have to convert a PID to an UID that the parse of /proc/<pid>/status requires a trailing space after the number - android::tidToPid() added, in the same vein as android::pidToUid(). - stats.tidToPid() added - If no credentials, set PID to 0 and UID to DEFAULT_OVERFLOWUID - If credentialed PID is 0, use stats.tidToPid() - If credentialed UID is DEFAULT_OVERFLOWUID, use stats.pidToUid() Test: remove +passcred from logd.rc for daemon and confirm very few UID=65534 or PID=0 cases actually show up Bug: 37985222 Change-Id: I7d20506e70e67beb3043d1537cf9450ab58dc278
* | | | | | | | | | Merge "logcat: test: inject for *.event_tag_filter" am: 2841b4efe0 am: ↵Mark Salyzyn2017-05-111-45/+64
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed1e53fc77 am: 9a2b70a7c8 Change-Id: I26c223bfe6a8028130427d73079fe5306cf65253