summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* media: reserve color formats used by flex-YUV422/444 and RGB/A888Lajos Molnar2015-04-241-4/+60
| | | | | | | These are used by Image when MediaCodec produces a non-surface higher-resolution YUV image, or codec-specific ordered RGB/A image Change-Id: Ie5cd8236586b375cbc707d45584bd35415c274fc
* am 44f1356e: am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd ↵Mark Salyzyn2015-04-231-1/+2
|\ | | | | | | | | | | | | parse error" * commit '44f1356e42a64fefb194b5c74b62402f4ec2881e': rootfs: init.rc start logd parse error
| * am 85a9566f: am 76520752: Merge "rootfs: init.rc start logd parse error"Mark Salyzyn2015-04-231-1/+2
| |\ | | | | | | | | | | | | * commit '85a9566f7c1b9bcef150edc587a3e64b1196ffc8': rootfs: init.rc start logd parse error
| | * am 76520752: Merge "rootfs: init.rc start logd parse error"Mark Salyzyn2015-04-231-1/+2
| | |\ | | | | | | | | | | | | | | | | * commit '765207524fcbe261686c5d96bc42ea3dcc124f0a': rootfs: init.rc start logd parse error
| | | * Merge "rootfs: init.rc start logd parse error"Mark Salyzyn2015-04-231-1/+2
| | | |\
| | | | * rootfs: init.rc start logd parse errorMark Salyzyn2015-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | init: /init.rc: 490: invalid option 'start' Change-Id: Ica985e45d4652dab0ebd434803344f14cc73d834
* | | | | am 9277b011: am 9d4b3010: am 2ce1d81f: Merge "liblog: ↵Mark Salyzyn2015-04-231-13/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | __android_log_is_loggable support Developer Options" * commit '9277b01138decd65cd98cd4265789369cb9797b7': liblog: __android_log_is_loggable support Developer Options
| * | | | am 9d4b3010: am 2ce1d81f: Merge "liblog: __android_log_is_loggable support ↵Mark Salyzyn2015-04-231-13/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Developer Options" * commit '9d4b3010b5b8c9e6c155df2ec1da4a33992a1ebd': liblog: __android_log_is_loggable support Developer Options
| | * | | am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options"Mark Salyzyn2015-04-231-13/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2ce1d81fd412657c14a14dd43ec570ac65cc1874': liblog: __android_log_is_loggable support Developer Options
| | | * | Merge "liblog: __android_log_is_loggable support Developer Options"Mark Salyzyn2015-04-231-13/+5
| | | |\ \
| | | | * | liblog: __android_log_is_loggable support Developer OptionsMark Salyzyn2015-04-221-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If logd.tag.<tag> is not found, check if persist.logd.tag.<tag> is available - Do not turn off the isLoggable functionality on "user" builds Bug: 19544788 Bug: 17760225 Change-Id: I3fec67b547aa431438965519507033798398e1e1
* | | | | | am ef9a093f: am 27660999: am 653f9581: Merge "logd: per UID less aggressive ↵Mark Salyzyn2015-04-231-2/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12.5% threshold" * commit 'ef9a093fddd989bc555485e169bc8cc8a2643a7e': logd: per UID less aggressive 12.5% threshold
| * | | | | am 27660999: am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold"Mark Salyzyn2015-04-231-2/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2766099959799434b114f6272107df04f55493d8': logd: per UID less aggressive 12.5% threshold
| | * | | | am 653f9581: Merge "logd: per UID less aggressive 12.5% threshold"Mark Salyzyn2015-04-231-2/+9
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '653f9581bf32cc2532c2b1d442d7bb2bbf0c173e': logd: per UID less aggressive 12.5% threshold
| | | * | | Merge "logd: per UID less aggressive 12.5% threshold"Mark Salyzyn2015-04-231-2/+9
| | | |\ \ \
| | | | * | | logd: per UID less aggressive 12.5% thresholdMark Salyzyn2015-04-221-2/+9
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per-UID quota has a threshold of 12.5% of the total log size. If less than that space is taken by the UID, then we will not engage the pruning based on worst UID. Change-Id: I9f15c9a26938f1115eb75e9c28ddb073e7680e06
* | | | | | am 92391131: am f94727b4: am 40502e1a: Merge "logd: ratelimit drop messages ↵Mark Salyzyn2015-04-231-4/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to 1/sec" * commit '92391131c43ec59d174d95ccfab6944832d1cee7': logd: ratelimit drop messages to 1/sec
| * | | | | am f94727b4: am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec"Mark Salyzyn2015-04-231-4/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f94727b4c6b10be576e145415bd6493a5e81c4a1': logd: ratelimit drop messages to 1/sec
| | * | | | am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec"Mark Salyzyn2015-04-231-4/+20
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '40502e1a70a0705ee9fbc50951bfae3c6b662632': logd: ratelimit drop messages to 1/sec
| | | * | | Merge "logd: ratelimit drop messages to 1/sec"Mark Salyzyn2015-04-231-4/+20
| | | |\ \ \
| | | | * | | logd: ratelimit drop messages to 1/secMark Salyzyn2015-04-221-4/+20
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20334069 Bug: 20370119 Change-Id: I6f850aec46c4df1c99a5b1f28db75d071e134ad5
* | | | | | am 8a457c79: am d1eec0de: am 876881b2: Merge "Add missing null checks after ↵Elliott Hughes2015-04-236-10/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocations." * commit '8a457c79276c65d1cc30fea929916986756a00b7': Add missing null checks after allocations.
| * | | | | am d1eec0de: am 876881b2: Merge "Add missing null checks after allocations."Elliott Hughes2015-04-226-10/+26
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'd1eec0de6a4af9565673809eb3cf29a1eefdcdb8': Add missing null checks after allocations.
| | * | | | am 876881b2: Merge "Add missing null checks after allocations."Elliott Hughes2015-04-226-10/+26
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '876881b22ad5d735cdb3ae2ac1afa6c336378808': Add missing null checks after allocations.
| | | * | | Merge "Add missing null checks after allocations."Elliott Hughes2015-04-226-10/+26
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Add missing null checks after allocations.Elliott Hughes2015-04-216-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20317729 Change-Id: I62bb761d48ee59a1f4ddd0cdd0632432305ca2ca
* | | | | | am b1e5d2e3: am 68f3a5a0: am f75f16a1: Merge "Fix typos in comments"Richard Uhler2015-04-221-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b1e5d2e386d2738ce9415d349f2a71945830d0a6': Fix typos in comments
| * | | | | am 68f3a5a0: am f75f16a1: Merge "Fix typos in comments"Richard Uhler2015-04-221-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '68f3a5a09f26831b85bfdc664fa4172a5135579e': Fix typos in comments
| | * | | | am f75f16a1: Merge "Fix typos in comments"Richard Uhler2015-04-221-2/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'f75f16a1ddbe6cde5e44036d48dc7a6c62d38cc0': Fix typos in comments
| | | * | | Merge "Fix typos in comments"Richard Uhler2015-04-221-2/+2
| | | |\ \ \
| | | | * | | Fix typos in commentsRichard Uhler2015-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia06ae6bec66e140fb302c650f7d62304864ca840
* | | | | | | am f91c0664: am 421d01c8: am d4196ef8: Merge "Add a command to call ↵Elliott Hughes2015-04-222-0/+50
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libnetutils\' do_dhcp." * commit 'f91c06646ed836c25aeacc4332851c53cd1e0861': Add a command to call libnetutils' do_dhcp.
| * | | | | | am 421d01c8: am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp."Elliott Hughes2015-04-222-0/+50
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '421d01c89500ddb71c976b20aa023b5d2fd9ccf0': Add a command to call libnetutils' do_dhcp.
| | * | | | | am d4196ef8: Merge "Add a command to call libnetutils\' do_dhcp."Elliott Hughes2015-04-222-0/+50
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd4196ef88757a87af41c0f7ee6ed7bfc3802c9c7': Add a command to call libnetutils' do_dhcp.
| | | * | | | Merge "Add a command to call libnetutils' do_dhcp."Elliott Hughes2015-04-222-0/+50
| | | |\ \ \ \
| | | | * | | | Add a command to call libnetutils' do_dhcp.Elliott Hughes2015-04-212-0/+50
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for wifi bringup. Change-Id: Ib1d1b1d15cb9ce57119457a780e169b8f98987c2
* | | | | | | am c8ecbc8a: am 99355ffb: am 0fb33b3c: Merge "Plumb more of the error ↵Elliott Hughes2015-04-221-7/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting through." * commit 'c8ecbc8aa80117bf9eb884fc70b19ab7abc55146': Plumb more of the error reporting through.
| * | | | | | am 99355ffb: am 0fb33b3c: Merge "Plumb more of the error reporting through."Elliott Hughes2015-04-221-7/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '99355ffbdf1bdd097ee1e484d61b1dbb8596276e': Plumb more of the error reporting through.
| | * | | | | am 0fb33b3c: Merge "Plumb more of the error reporting through."Elliott Hughes2015-04-221-7/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '0fb33b3c05a0c935e17ae93dbe474f816cec666b': Plumb more of the error reporting through.
| | | * | | | Merge "Plumb more of the error reporting through."Elliott Hughes2015-04-221-7/+4
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Plumb more of the error reporting through.Elliott Hughes2015-04-211-7/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't fix the bug, but it does flatten the bug to the well-known and long-standing "adb shell" doesn't return exit statuses, so when we fix that, this one will fix itself. Bug: http://b/20423886 Change-Id: I48351e46f05dd3f2f6e57f0df1d851333458d0ef
* | | | | | am 59f01128: am 14000a3a: am 9a0cea92: Merge "Add a couple more adb shell ↵Elliott Hughes2015-04-221-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression tests." * commit '59f01128982356ccbe4d1d302bb568a08d3e4795': Add a couple more adb shell regression tests.
| * | | | | am 14000a3a: am 9a0cea92: Merge "Add a couple more adb shell regression tests."Elliott Hughes2015-04-211-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '14000a3a35d42815a95dce63b40f71e5a6cb9128': Add a couple more adb shell regression tests.
| | * | | | am 9a0cea92: Merge "Add a couple more adb shell regression tests."Elliott Hughes2015-04-211-0/+4
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '9a0cea92c8b74114b70ac3339b2b611633f6a31a': Add a couple more adb shell regression tests.
| | | * | | Merge "Add a couple more adb shell regression tests."Elliott Hughes2015-04-211-0/+4
| | | |\ \ \
| | | | * | | Add a couple more adb shell regression tests.Elliott Hughes2015-04-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/15479704 Change-Id: Id3e7f0df101ad61db509df313c13210a8bd8b124
* | | | | | | Merge "STOPSHIP: Additional Wifi logging temporarily disabled"Mark Salyzyn2015-04-211-1/+2
|\ \ \ \ \ \ \
| * | | | | | | STOPSHIP: Additional Wifi logging temporarily disabledMark Salyzyn2015-04-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20416721 Change-Id: I1be1c742f47f0e673eef6a8d391246f47c35c336
* | | | | | | | am 97147ef2: am a7d47092: am a75b3de2: Merge "Mark time conversion functions ↵Michael Wright2015-04-211-15/+17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as constexpr" * commit '97147ef2cd09bef1f348375611905864fa0fd068': Mark time conversion functions as constexpr
| * | | | | | | am a7d47092: am a75b3de2: Merge "Mark time conversion functions as constexpr"Michael Wright2015-04-211-15/+17
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'a7d470920f7d92b58e6072c6e5555204655d0467': Mark time conversion functions as constexpr