summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename Looper::isIdling() to isPolling() to resolve confusion.Jeff Brown2015-03-112-10/+11
| | | | | | | | | The loop isn't technically idle at this time, it's just checking whether any file descriptors have pending events. However it's still a good signal as to whether the loop is alive. Bug: 19532373 Change-Id: I555c473e70ffd8a56e1b10aa60026eb674a16de9
* am 44ad0f9b: am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-111-1/+1
|\ | | | | | | | | * commit '44ad0f9b1f1f06f4db58f985c847f455c3b02e3c': Generate gnu hash for arm only
| * am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-101-1/+1
| |\ | | | | | | | | | | | | * commit 'ddd97cafb8d8383d341e609089013e7720f16f15': Generate gnu hash for arm only
| | * am b27bd948: Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-101-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'b27bd94896dcfd94940e65a2438dc6a337c03038': Generate gnu hash for arm only
| | | * Merge "Generate gnu hash for arm only"Dimitry Ivanov2015-03-101-1/+1
| | | |\
| | | | * Generate gnu hash for arm onlyGoran Jakovljevic2015-03-101-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mips build failure caused by: https://android-review.googlesource.com/#/c/139580/ As previously discussed [1], MIPS does not support GNU-style ELF hashes. [1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk Change-Id: I757fef1d47663da3e414f5771dfc580ea7aa3732
* | | | Merge "Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT"Andy Hung2015-03-101-1/+1
|\ \ \ \
| * | | | Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BITAndy Hung2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be Q8.23 (24 bits packed in the least significant 3 bytes). Change-Id: If5ca27c27249487e28c0be42ebdd283308ff8552
* | | | | am 6a8ed4b6: am d3e877f8: am ad571cdd: Merge "Add backtrace support for mips64."Elliott Hughes2015-03-104-3/+153
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '6a8ed4b6c05fe471e2398a7be1c48695e4c49194': Add backtrace support for mips64.
| * | | | am d3e877f8: am ad571cdd: Merge "Add backtrace support for mips64."Elliott Hughes2015-03-104-3/+153
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'd3e877f81a28771b3e8ac338e5433e1bc1a1f678': Add backtrace support for mips64.
| | * | | am ad571cdd: Merge "Add backtrace support for mips64."Elliott Hughes2015-03-104-3/+153
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit 'ad571cdd2ce8c85f92ed87e021c94569b24fc7c1': Add backtrace support for mips64.
| | | * | Merge "Add backtrace support for mips64."Elliott Hughes2015-03-104-3/+153
| | | |\ \
| | | | * | Add backtrace support for mips64.Douglas Leung2015-03-094-3/+153
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12ea2fcbe6780bb596f51988eae1ceafcec858df
* | | | | | am dccf65ef: am 1f909334: am ed5b81c9: Merge "Fix LP32 build."Elliott Hughes2015-03-101-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dccf65ef024978ce26ddc96ced58b2417a50967f': Fix LP32 build.
| * | | | | am 1f909334: am ed5b81c9: Merge "Fix LP32 build."Elliott Hughes2015-03-101-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '1f909334507e6f4c0db20a71a4fceb0397c6ee7d': Fix LP32 build.
| | * | | | am ed5b81c9: Merge "Fix LP32 build."Elliott Hughes2015-03-101-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'ed5b81c9e59c0a6c618f43964a4a2639448c0686': Fix LP32 build.
| | | * | | Merge "Fix LP32 build."Elliott Hughes2015-03-101-1/+2
| | | |\ \ \
| | | | * | | Fix LP32 build.Elliott Hughes2015-03-091-1/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I66e084330e7a32eac639d06187e780ffa0ad7b14
* | | | | | am 264157d9: am 8576aa05: am 9cce837d: Merge "Increase output width for ↵Elliott Hughes2015-03-101-5/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wchan and pc on 64 bit targets." * commit '264157d97e0220cee69b798cbf435548f332f240': Increase output width for wchan and pc on 64 bit targets.
| * | | | | am 8576aa05: am 9cce837d: Merge "Increase output width for wchan and pc on ↵Elliott Hughes2015-03-101-5/+22
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64 bit targets." * commit '8576aa055ca9278d454ef5261032ecfd542badd4': Increase output width for wchan and pc on 64 bit targets.
| | * | | | am 9cce837d: Merge "Increase output width for wchan and pc on 64 bit targets."Elliott Hughes2015-03-101-5/+22
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '9cce837d025d05a07a3b91cf23337a7b688c3eb9': Increase output width for wchan and pc on 64 bit targets.
| | | * | | Merge "Increase output width for wchan and pc on 64 bit targets."Elliott Hughes2015-03-101-5/+22
| | | |\ \ \
| | | | * | | Increase output width for wchan and pc on 64 bit targets.Chris Dearman2015-03-091-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also switch wchan to the textual form, since most of us don't know kernel addresses off by heart. Change-Id: I8e28d910034d8171c5b994189b16114f80f38d2f
* | | | | | | am 682b6460: am 4c37448f: am 19833d24: Merge "Generate sysv hash for liblog"Dmitriy Ivanov2015-03-101-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '682b6460611089926be0b420e0329f48c640a3d9': Generate sysv hash for liblog
| * | | | | | am 4c37448f: am 19833d24: Merge "Generate sysv hash for liblog"Dmitriy Ivanov2015-03-101-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4c37448f79ec0dba9634ef037a7217bd60799766': Generate sysv hash for liblog
| | * | | | | am 19833d24: Merge "Generate sysv hash for liblog"Dmitriy Ivanov2015-03-101-0/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '19833d24887164fdfa7313bda533283f47acd205': Generate sysv hash for liblog
| | | * | | | Merge "Generate sysv hash for liblog"Dmitriy Ivanov2015-03-101-0/+4
| | | |\ \ \ \
| | | | * | | | Generate sysv hash for liblogDmitriy Ivanov2015-03-091-0/+4
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 19059885 Change-Id: I6fff4372504e3ca0d870c5cafe6f19d412787923
* | | | | | | am f741fc00: am ee3e49cf: am ad5ed361: Merge "Fix build from ↵Dan Albert2015-03-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Werror=maybe-uninitialized." * commit 'f741fc00374b4fd571c1c5e993627ed9ab6e6a3b': Fix build from -Werror=maybe-uninitialized.
| * | | | | | am ee3e49cf: am ad5ed361: Merge "Fix build from -Werror=maybe-uninitialized."Dan Albert2015-03-101-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ee3e49cf733238625c11ff481b009413d8c30c6d': Fix build from -Werror=maybe-uninitialized.
| | * | | | | am ad5ed361: Merge "Fix build from -Werror=maybe-uninitialized."Dan Albert2015-03-101-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ad5ed361a757494c0b308ec43cddc80ed9d8843f': Fix build from -Werror=maybe-uninitialized.
| | | * | | | Merge "Fix build from -Werror=maybe-uninitialized."Dan Albert2015-03-101-1/+1
| | | |\ \ \ \
| | | | * | | | Fix build from -Werror=maybe-uninitialized.Dan Albert2015-03-091-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't actually ever be uninitialized because the code will take a failure path if the code that initializes it fails. The goto seems to thwart this check though. Not sure why this is only firing on userdebug builds yet. I'll look in to it tomorrow. Change-Id: Ie9d837d6baea255d2a4d169355b53dfd775eacce
* | | | | | | Fix build from -Werror=maybe-uninitialized.Dan Albert2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This won't actually ever be uninitialized because the code will take a failure path if the code that initializes it fails. The goto seems to thwart this check though. Not sure why this is only firing on userdebug builds yet. I'll look in to it tomorrow. Change-Id: Ie9d837d6baea255d2a4d169355b53dfd775eacce (cherry picked from commit 83ca56ac98c089dfa5d61f282353e9ae2024797e)
* | | | | | | Parse boot properties from device treeRom Lemarchand2015-03-101-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure compatible DT node is "android,firmware" - Set ro.boot.* properties from firmware/android/ DT node Change-Id: If3d0716831516cb3d3fde1f75d57e2691d42d054
* | | | | | | am a4b8819e: am 3f411357: am 5f2ccb0e: Merge "Move adb to C++."Dan Albert2015-03-1034-278/+317
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a4b8819e165988adf5d5eb5b4a41b77ccc6bf522': Move adb to C++.
| * | | | | | am 3f411357: am 5f2ccb0e: Merge "Move adb to C++."Dan Albert2015-03-1034-278/+317
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '3f4113571f89dc52b06314e8126ba5e252e9caaf': Move adb to C++.
| | * | | | | am 5f2ccb0e: Merge "Move adb to C++."Dan Albert2015-03-1034-278/+317
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '5f2ccb0efd1331f0137e294bed7a076c472f0ed6': Move adb to C++.
| | | * | | | Merge "Move adb to C++."Dan Albert2015-03-1034-278/+317
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Move adb to C++.Dan Albert2015-03-0934-278/+317
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I keep trying to clean things up and needing std::strings. Might as well just do this now. usb_linux_client.c is going to stay as C because GCC isn't smart enough to deal with the designated initializers it uses (though for some reason it is in C mode). The Darwin files are staying as C because I don't have a way to test that they build. The Windows files are staying as C because while I can actually build for them, it's slow and painful. Change-Id: I75367d29205a9049d34460032b3bb36384f43941
* | | | | | am 8414ce2a: am ea998e0e: am 9b1fd969: Merge "Fix a writex transcription error."Dan Albert2015-03-101-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '8414ce2acefd8359a9c5dda75bce1c68d82a3731': Fix a writex transcription error.
| * | | | | am ea998e0e: am 9b1fd969: Merge "Fix a writex transcription error."Dan Albert2015-03-091-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'ea998e0ef975dbea2034ae4a7208c36c37eedfa7': Fix a writex transcription error.
| | * | | | am 9b1fd969: Merge "Fix a writex transcription error."Dan Albert2015-03-091-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '9b1fd969a7b7f1c6f1ed19719f21d57001d3c461': Fix a writex transcription error.
| | | * | | Merge "Fix a writex transcription error."Dan Albert2015-03-091-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix a writex transcription error.Dan Albert2015-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71b11127d41ebac6caf68926089c5a3b99d8c21e
* | | | | | am 756cc397: am 8b09c276: am 332c2881: Merge "Make the root/unroot test more ↵Dan Albert2015-03-101-2/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robust." * commit '756cc39739a67610abaff3f2b72f6a15514f6ffc': Make the root/unroot test more robust.
| * | | | | am 8b09c276: am 332c2881: Merge "Make the root/unroot test more robust."Dan Albert2015-03-091-2/+22
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8b09c2761523dfb05eb9c220f680cf2bef9c940e': Make the root/unroot test more robust.
| | * | | | am 332c2881: Merge "Make the root/unroot test more robust."Dan Albert2015-03-091-2/+22
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '332c2881305549450b162d854b139611d7bdc42f': Make the root/unroot test more robust.
| | | * | | Merge "Make the root/unroot test more robust."Dan Albert2015-03-091-2/+22
| | | |\ \ \
| | | | * | | Make the root/unroot test more robust.Dan Albert2015-03-091-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check the current adb user to choose the order of root/unroot. * Re-root the device when finished. Change-Id: I47a14b89e2c405bd63722e4d2043fcc629fb5e58