summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "logd: default off by-UID spam filter"Mark Salyzyn2014-05-061-2/+2
|\
| * logd: default off by-UID spam filterMark Salyzyn2014-05-061-2/+2
|/ | | | | Bug: 14469172 Change-Id: I37c8dbcea0490afb994cbe6f033591fea1c58bc8
* Merge changes Ibff1f74e,Ic82595cf,If4e01cabJP Abgrall2014-05-066-212/+155
|\ | | | | | | | | | | | | * changes: fastboot: Added tos as an optional image fastboot: Fixed optional entries fastboot: allow format on devices with small buffers
| * fastboot: Added tos as an optional imageDaniel Rosenberg2014-05-061-2/+5
| | | | | | | | | | Change-Id: Ibff1f74ee4a949501ceae0b897f896067f022763 Signed-off-by: Daniel Rosenberg <drosen@google.com>
| * fastboot: Fixed optional entriesDaniel Rosenberg2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | Previously, if an image was listed as optional, but was not found, flashall would fail. Now it will proceed if optional images are not present. Change-Id: Ic82595cf0cd6ddce4c676de590f03f1a95f32040 Signed-off-by: Daniel Rosenberg <drosen@google.com>
| * fastboot: allow format on devices with small buffersDmitry Grinberg2014-05-066-209/+149
|/ | | | | | | | | | Formatting large partitions on devices with small transfer buffers did not work before since format used a strange path through the code to send data. It now uses the normal path. Also cleaned up a bit. FS code now lives in a separate file and the custom path for format is gone. Change-Id: If4e01cabc2e250b7c02ca7ce8c268e51d49e1529
* Merge "Fix 64-bit host build."Ying Wang2014-05-062-6/+6
|\
| * Fix 64-bit host build.Ying Wang2014-05-062-6/+6
|/ | | | | Bug: 13751317 Change-Id: I8ba4fc9918fba0975eb61ec37a8a16b02acfa864
* Merge "Fastboot: fix fastboot timeout issue of Windows host side"JP Abgrall2014-05-061-3/+3
|\
| * Fastboot: fix fastboot timeout issue of Windows host sideJiebing Li2014-04-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally fastboot follows the procedure that host sends a command to device and device sends back response after the command is executed. But sometimes device spends too long time to execute the command so that timeout error occurs before host receives the response. This patch fixes the issue by aligning with the solution of ADB. ADB commit id: 1c4b760a5d41de3196572d50d1404e453174cf9a Change-Id: I50e6bf428ea38219b64cca6ab82db22af28e0264 Author: Jiebing Li <jiebing.li@intel.com> Signed-off-by: Bo Huang <bo.b.huang@intel.com>
* | Merge "Log stack even if tombstone cannot be created."Christopher Ferris2014-05-051-10/+17
|\ \
| * | Log stack even if tombstone cannot be created.Christopher Ferris2014-05-051-10/+17
| | | | | | | | | | | | | | | Bug: 14498701 Change-Id: I62c271bef2f73166eeb91d3fa3ce1e1b724a081f
* | | Merge "Add Silvermont architecture cache sizes"Elliott Hughes2014-05-051-2/+9
|\ \ \
| * | | Add Silvermont architecture cache sizesHenrik Smiding2014-04-181-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Silvermont specific cache sizes for memset16/32 SSE optimization. Change-Id: Ib5ea086d57544e74ac384ee1ef516b8511392f70 Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
* | | | Merge "libcutils: win_sdk build issues"Mark Salyzyn2014-05-053-5/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | libcutils: win_sdk build issuesMark Salyzyn2014-05-053-5/+14
|/ / / | | | | | | | | | Change-Id: Ic431166f686aebfd0ee00ad3224b95237ff7a0de
* | | Merge "mkbootimg: fix padding calculation for 2ndstage loader"Colin Cross2014-05-031-1/+1
|\ \ \
| * | | mkbootimg: fix padding calculation for 2ndstage loaderAndrew Boie2014-04-241-1/+1
| | |/ | |/| | | | | | | | | | Change-Id: I8db844cbc52896e51886b725fb86fd1b0fa57899 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | Merge "init: add 'enable <service>' to negate "service <service>... disabled""JP Abgrall2014-05-036-2/+33
|\ \ \
| * | | init: add 'enable <service>' to negate "service <service>... disabled"JP Abgrall2014-05-036-2/+33
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable <servicename> Turns a disabled service into an enabled one as if the service did not specify disabled in the rc file. It will also start the service if needed. Bug: 14472973 Change-Id: Id0b49cc687a2bc74f6f92e066c617724cc94908d Signed-off-by: JP Abgrall <jpa@google.com>
* | | Merge "logd: build breakage in git_master-nova @ 1151709"Mark Salyzyn2014-05-021-1/+1
|\ \ \
| * | | logd: build breakage in git_master-nova @ 1151709Mark Salyzyn2014-05-021-1/+1
|/ / / | | | | | | | | | Change-Id: Ic7920d1b0930155c20a896720a79af62f8acacc1
* | | Merge "liblog: logcat: Move library print test into gTest"Mark Salyzyn2014-05-023-92/+70
|\ \ \
| * | | liblog: logcat: Move library print test into gTestMark Salyzyn2014-05-023-92/+70
| | | | | | | | | | | | | | | | Change-Id: Icd33808d4c974625f4fd0a126a90a2b4c90c8315
* | | | Merge "logd: turn on -Werror"Mark Salyzyn2014-05-023-5/+2
|\| | |
| * | | logd: turn on -WerrorMark Salyzyn2014-05-023-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Deal with some -Wunused / -Wunused-variable issues Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc21
* | | | Merge "logd: 64-bit compile issue"Mark Salyzyn2014-05-022-3/+6
|\| | |
| * | | logd: 64-bit compile issueMark Salyzyn2014-05-022-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - ULONG_MAX is used against an uint32 - Add tv_sec_max and tv_nsec_max constants to log_time Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc22
* | | | Merge "debuggerd: turn on -Werror"Mark Salyzyn2014-05-023-12/+10
|\| | |
| * | | debuggerd: turn on -WerrorMark Salyzyn2014-05-023-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | - Deal with some -Wunused / -Wunused-variable issues Change-Id: I39849fe30170f69d1cab7d4ad2629b3a49e14ee7
* | | | Merge "logcat: turn on -Werror"Mark Salyzyn2014-05-023-7/+6
|\| | |
| * | | logcat: turn on -WerrorMark Salyzyn2014-05-023-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Deal with some -Wunused issues Change-Id: Ic4ab9a49f13e156a73d40266e413dee3e6396178
* | | | Merge "logwrapper: turn on -Werror"Mark Salyzyn2014-05-022-4/+3
|\| | |
| * | | logwrapper: turn on -WerrorMark Salyzyn2014-05-022-4/+3
|/ / / | | | | | | | | | | | | | | | - Deal with some -Wunused / -Wunused-variable issues Change-Id: I27a99ffb962289ebbf04b40870b9404842030d2f
* | | Merge "libcutils: Mac build pulls in __unused from sys/cdefs.h"Mark Salyzyn2014-05-021-0/+2
|\ \ \
| * | | libcutils: Mac build pulls in __unused from sys/cdefs.hMark Salyzyn2014-05-021-0/+2
|/ / / | | | | | | Change-Id: I2da8a52e07cef0b749f7e60709536e98bd96660e
* | | Merge "libcutils: turn on -Werror"Mark Salyzyn2014-05-0218-103/+96
|\ \ \
| * | | libcutils: turn on -WerrorMark Salyzyn2014-05-0118-103/+96
|/ / / | | | | | | | | | | | | | | | - Deal with some -Wunused / -Wunused-variable issues Change-Id: I28c23fb213382a392ec30935749fb359e072d664
* | | Merge "libusbhost: Fix issue of multiple inotify event at same time."JP Abgrall2014-05-011-3/+4
|\ \ \
| * | | libusbhost: Fix issue of multiple inotify event at same time.Bo Huang2014-04-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libusbhost can handle multiple inotify events at same time on Kit kat. In original implementation, the function-level ret is assigned with length of read and used for while loop. if want to add a new watch for subdirectory,inotify_add_watch will update the function-level ret with watch descriptor. It impact on while loop to do exit. Add local result to avoid it. Change-Id: I101041ccfd54eaac14969a45e90ab2e49bdff578 Signed-off-by: Bo Huang <bo.b.huang@intel.com>
* | | | Merge "fastboot: Make tags_offset a command line option."Mohamad Ayyash2014-05-011-1/+5
|\ \ \ \
| * | | | fastboot: Make tags_offset a command line option.Mohamad Ayyash2014-05-011-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | cherry picked from commit bdf513c5f25b3c2051af737c37a7734c4559208e Change-Id: I4ceca528f88cc8ede5742f8a67bec972e41eebe7
* | | | | Merge "libsysutil: turn on -Werror (part deux)"Mark Salyzyn2014-05-012-5/+4
|\ \ \ \ \
| * | | | | libsysutil: turn on -Werror (part deux)Mark Salyzyn2014-05-012-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - x86_64 format warnings Change-Id: I81c2702f564bcada946f6a10f34bbf34c90f766b
* | | | | | Merge "init: 64-bit build issue"Mark Salyzyn2014-05-011-1/+2
|\| | | | |
| * | | | | init: 64-bit build issueMark Salyzyn2014-05-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from Icc5344abc184adf4247175d85b2da08af4636e49) Change-Id: I88b0c9b20720ac62ebae8359ded4ab77b4ebcdde
* | | | | | Merge "logd: oneline statistics does not report PID gone"Mark Salyzyn2014-05-012-10/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | logd: oneline statistics does not report PID goneMark Salyzyn2014-05-012-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - oneline, add check for gone - Add pidGone() method, which caches the gone status Change-Id: I8f03daeafb58583c2b08ec6b540486c05da0872d
* | | | | | Merge "ueventd: Ueventd changes the permission of sysfs files for max/min ↵Ruchi Kandoi2014-05-012-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | cpufreq"
| * | | | | ueventd: Ueventd changes the permission of sysfs files for max/minRuchi Kandoi2014-05-012-1/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpufreq The owner and permissions for the sysfs file /sys/devices/system/cpu*/cpufreq/scaling_max/min_freq is changed. This would allow the PowerHAL to change the max/min cpufreq even after the associated CPU's are hotplugged out and back in. Change-Id: Ibe0b4aaf3db555ed48e89a7fcd0c5fd3a18cf233 Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>