summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* liblog: support struct logger_event_v2 formatMark Salyzyn2014-01-161-6/+15
| | | | Change-Id: I34c96adffab3478dae8f5a2597a840caad5092cc
* liblog: update timestamp on NOTICE fileMark Salyzyn2014-01-161-1/+1
| | | | Change-Id: I776509232aaa50e14fe79e45ab133c0ea3985933
* libcutils: resolve warning in iosched_policy.cMark Salyzyn2014-01-161-3/+6
| | | | Change-Id: I35b0d1eeba21cc1ed9645a5acfa180ed20797c56
* liblog: Add const pedanticsMark Salyzyn2014-01-161-11/+11
| | | | Change-Id: I819695b778ac08fcfc9b1a87f3f86e5715f53084
* logcat: Add -T flag (-t w/o assumption of -d)Mark Salyzyn2014-01-162-1/+72
| | | | Change-Id: I49763e2db83755e0b7b12dfa3f83a3957c54d389
* Merge "logcat: Add logcat test suite"Mark Salyzyn2014-01-174-14/+440
|\
| * logcat: Add logcat test suiteMark Salyzyn2014-01-164-14/+440
| | | | | | | | Change-Id: Ic4c84b88b8d899965c9765bdc3ee223ef73ba7d1
* | Merge "liblog: Add cpu utilization test"Mark Salyzyn2014-01-171-0/+156
|\ \ | |/
| * liblog: Add cpu utilization testMark Salyzyn2014-01-161-0/+156
| | | | | | | | | | | | | | | | | | - followup to measure CPU utilization in liblog to ensure this issue gets caught before a regression passes into the labs. Threshold for failure is 1%. BUG: 12457855 Change-Id: I40568a72aeef2f554b19ad55f3dd3c02bc023f24
* | Merge "liblog: Add liblog test suite"Mark Salyzyn2014-01-178-4/+984
|\ \ | |/
| * liblog: Add liblog test suiteMark Salyzyn2014-01-168-4/+984
| | | | | | | | Change-Id: Ia457d518b4e7ff37e840336ff0c48583709700d4
* | Merge "debuggerd: Support newline split in log messages"Mark Salyzyn2014-01-171-9/+18
|\ \ | |/
| * debuggerd: Support newline split in log messagesMark Salyzyn2014-01-161-9/+18
| | | | | | | | Change-Id: I2c19f12ef027ab1e1455ce78824537da1b03edcd
* | Merge "liblog: deprecate export LOGGER ioctl definitions"Mark Salyzyn2014-01-172-15/+11
|\ \ | |/
| * liblog: deprecate export LOGGER ioctl definitionsMark Salyzyn2014-01-162-15/+11
| | | | | | | | Change-Id: I150cad9309255bec2b8bc7230c744e9bbb1b9578
* | am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete ↵Elliott Hughes2014-01-172-162/+0
|\ \ | |/ |/| | | | | | | | | \'setconsole\' command." * commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a': Remove obsolete 'setconsole' command.
| * am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' ↵Elliott Hughes2014-01-172-162/+0
| |\ | | | | | | | | | | | | | | | | | | command." * commit '320f2940239c405889baa3c5184beb1d8971837d': Remove obsolete 'setconsole' command.
| | * am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."Elliott Hughes2014-01-172-162/+0
| | |\ | | | | | | | | | | | | | | | | * commit 'e20b5f71c01d912a5ce6aa4140e6e35edae8f4df': Remove obsolete 'setconsole' command.
| | | * am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."Elliott Hughes2014-01-162-162/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '524b3a0c40fcca4b2259f317b2d098434998ce47': Remove obsolete 'setconsole' command.
| | | | * Merge "Remove obsolete 'setconsole' command."Elliott Hughes2014-01-162-162/+0
| | | | |\
| | | | | * Remove obsolete 'setconsole' command.Elliott Hughes2014-01-162-162/+0
| | | | |/ | | | | | | | | | | | | | | | Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
* | | | | Merge "resolved conflicts for merge of ec9e5891 to master"Elliott Hughes2014-01-1629-63/+56
|\ \ \ \ \
| * \ \ \ \ resolved conflicts for merge of ec9e5891 to masterElliott Hughes2014-01-1629-63/+56
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
| | * | | | am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-1630-64/+57
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '8940c0a07f8d6682712e2d2ee387e78096602f99': system/core 64-bit cleanup.
| | | * | | am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-1630-64/+57
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * commit '97373bbc713c52c43e0fa48d0f16466e0a450178': system/core 64-bit cleanup.
| | | | * | am 7cd15614: Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-1630-64/+57
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | | | | | | | * commit '7cd1561410473c71d40cec822fb53a282b5b3279': system/core 64-bit cleanup.
| | | | | * Merge "system/core 64-bit cleanup."Elliott Hughes2014-01-1630-64/+57
| | | | | |\
| | | | | | * system/core 64-bit cleanup.Elliott Hughes2014-01-1630-64/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up most of the size-related problems in system/core. There are still a few changes needed for a clean 64-bit build, but they look like they might require changes to things like the fastboot protocol. Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
* | | | | | | Merge "add the pre-recovery service"Doug Zongker2014-01-163-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add the pre-recovery serviceDoug Zongker2014-01-163-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a service called "pre-recovery" which is normally stopped but can be started by the system server when we want to go into recovery. It will do any preparation needed (currently needed to handle update packages that reside on an encrypted /data partition) and then set sys.powerctl when it's ready to actually reboot. Bug: 12188746 Change-Id: I894a4cb200395a0f6d7fe643ed4c2ac0a45d2052
* | | | | | | Merge "liblog: deprecate export of LOGGER_LOG_* defines"Mark Salyzyn2014-01-162-7/+7
|\ \ \ \ \ \ \
| * | | | | | | liblog: deprecate export of LOGGER_LOG_* definesMark Salyzyn2014-01-142-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I263af8e889f8f2ad91b91757caf90a4d17823dab
* | | | | | | | am 325a99fb: am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase ↵Nick Kralevich2014-01-161-6/+12
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verboseness on mount errors" * commit '325a99fb630306ff99cc24be720061ecec7dae17': fs_mgr: increase verboseness on mount errors
| * | | | | | | am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness ↵Nick Kralevich2014-01-161-6/+12
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on mount errors" * commit 'bdea585e68a054552a26272ec9321afaad9ac915': fs_mgr: increase verboseness on mount errors
| | * | | | | | am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"Nick Kralevich2014-01-161-6/+12
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit 'a6b65eeef1280bbd38172d0b36b3493888e94b4b': fs_mgr: increase verboseness on mount errors
| | | * | | | | am 7580661d: Merge "fs_mgr: increase verboseness on mount errors"Nick Kralevich2014-01-161-6/+12
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | * commit '7580661df179eb037c0dbe96e3bde1bc9e6bfbdc': fs_mgr: increase verboseness on mount errors
| | | | * | | | Merge "fs_mgr: increase verboseness on mount errors"Nick Kralevich2014-01-161-6/+12
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | | * | | fs_mgr: increase verboseness on mount errorsWilliam Roberts2014-01-151-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While debugging a mount error, the dmesg output was less than ideal. The error would be declared but why the mount failed, and what options were passed was not present. This patch ensures that the mount options and underlying errno are printed. Change-Id: I2b3a2c113149df878c0a8a10ef86fd9e4f909658
* | | | | | | | Merge "fastboot: Make tags_offset a command line option."Mohamad Ayyash2014-01-151-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | fastboot: Make tags_offset a command line option.Mohamad Ayyash2014-01-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches what mkbootimg supports in 5d4af6314fded027952941110a520dc9aa234a14 It will allow "fastboot flash:raw ..." to work for devices that need tags_offset. Change-Id: I4ceca528f88cc8ede5742f8a67bec972e41eebe7
* | | | | | | | | Merge "Miscellaneous updates to <system/audio.h>"Glenn Kasten2014-01-151-4/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Miscellaneous updates to <system/audio.h>Glenn Kasten2014-01-151-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add single-precision floating-point PCM format: - AUDIO_FORMAT_PCM_SUB_FLOAT - AUDIO_FORMAT_PCM_FLOAT Add symbols to replace hard-coded constants in code: - AUDIO_IO_HANDLE_NONE - AUDIO_IN_ACOUSTICS_NONE - AUDIO_INTERLEAVE_* - AUDIO_STREAM_MIN Update comments. Fix whitespace in switch statement. Change-Id: I61862c188ebac06657b5d9887164edc24b8ab8f5
* | | | | | | | | | am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon ↵Nick Kralevich2014-01-151-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | /data/misc/media." * commit '11190d0ccb1216307043ceecf5360f1a1a946cd1': restorecon /data/misc/media.
| * | | | | | | | am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '4552987e6a1338dac26f13f0851657335d998ffb': restorecon /data/misc/media.
| | * | | | | | | am c93904b4: am e847f429: Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'c93904b445830cd17fd9dd6d4fe236987577a478': restorecon /data/misc/media.
| | | * | | | | | am e847f429: Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'e847f429f43ae56aaa406697ca603c8469e2100b': restorecon /data/misc/media.
| | | | * | | | | Merge "restorecon /data/misc/media."Nick Kralevich2014-01-151-0/+1
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | | * | | | restorecon /data/misc/media.Stephen Smalley2014-01-151-0/+1
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it will be mislabeled on upgrades with existing userdata. Change-Id: Ibde88d5d692ead45b480bb34cfe0831baeffbf94 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | | | am 7a2c2e80: am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: ↵Nick Kralevich2014-01-151-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct warning on unused function parameter"" * commit '7a2c2e8048cc6bba9b78be8a01c0b056b5548718': Revert "fs_mgr: correct warning on unused function parameter"
| * | | | | | | am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct ↵Nick Kralevich2014-01-151-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning on unused function parameter"" * commit 'aa25204f43421fe363238176d74e68eb8cdb5b01': Revert "fs_mgr: correct warning on unused function parameter"