summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* (Probably) fix the mac build.Dan Albert2015-03-231-1/+1
| | | | Change-Id: I4209f2d66d8701df2f32dcfb79abea9ea6d3dc69
* Merge "libziparchive: fix extraction of >2GiB images"Greg Hackmann2015-03-231-1/+1
|\
| * libziparchive: fix extraction of >2GiB imagesGreg Hackmann2015-03-231-1/+1
| | | | | | | | | | | | | | Bug: 19888174 Change-Id: I33a577909ced522d46223e2182e0bb18c291af27 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | Merge "Move gettid() into libcutils."Dan Albert2015-03-234-26/+38
|\ \
| * | Move gettid() into libcutils.Dan Albert2015-03-234-26/+38
|/ / | | | | | | Change-Id: Ic8a15036833e6d129b7998d954b804be391de399
* | Merge "Update string Split API."Dan Albert2015-03-234-28/+63
|\ \
| * | Update string Split API.Dan Albert2015-03-234-28/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | Return a new vector rather than appending to the parameter. Delimiters are also a string rather than a character. Split on any character in the string. Change-Id: I039b332ace5578590df9e7ca0e8fa3db28db30a3
* | | Merge "Add a CleanSpec for grep/toolbox."Elliott Hughes2015-03-231-0/+1
|\ \ \
| * | | Add a CleanSpec for grep/toolbox.Elliott Hughes2015-03-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I moved grep out of toolbox a couple of months ago, so hopefully no one else should see this. Just in case, though, remove grep and toolbox so they both get rebuilt and any symbolic links will find themselves pointing to the right binary. Bug: 19878755 Change-Id: I15f63500cae3578a82a895f851c797fd324bbe02
* | | | Merge "Add missing parenthesis in init log message."Elliott Hughes2015-03-231-1/+1
|\ \ \ \
| * | | | Add missing parenthesis in init log message.Elliott Hughes2015-03-231-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: Iddcd8a002bfc692b1e70d59fa8c6530306c500fa
* | | | Merge "Remove libzipfile."Narayan Kamath2015-03-238-816/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove libzipfile.Narayan Kamath2015-03-208-816/+0
| | | | | | | | | | | | | | | | | | | | | | | | No longer used and superceded by libziparchive. Change-Id: Iafbaa5affd0ffd4de02681c8bbe32b21c523ff49
* | | | Merge "Fix the number of arguments for verity commands"Sami Tolvanen2015-03-221-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix the number of arguments for verity commandsSami Tolvanen2015-03-221-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Neither of the built-in verity state commands accept arguments, so set the number of required arguments to zero. Change-Id: Id57fe671b6b82eaf1e43b8ed7ff9d1e502ada5bd
* | | Merge "Always use strerror to report errno."Elliott Hughes2015-03-214-7/+7
|\ \ \
| * | | Always use strerror to report errno.Elliott Hughes2015-03-204-7/+7
|/ / / | | | | | | | | | Change-Id: Icd18e4bd7dc093c18967f45b99cd451359457b03
* | | Merge "Ensure all init commands are documented."Elliott Hughes2015-03-211-30/+77
|\ \ \
| * | | Ensure all init commands are documented.Elliott Hughes2015-03-201-30/+77
| |/ / | | | | | | | | | Change-Id: I21ef4d88b33337093396e14d792e1ff1fe0bfa17
* | | Merge "init: refactor firmware loading locations into table"Daniel Rosenberg2015-03-201-44/+32
|\ \ \
| * | | init: refactor firmware loading locations into tableDaniel Rosenberg2015-03-201-44/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: I3ce8f9d237bf783335ae85540306aa539a8da568 Signed-off-by: Daniel Rosenberg <drosen@google.com>
* | | | Merge "Use unique_ptr to call closedir."Elliott Hughes2015-03-202-56/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Use unique_ptr to call closedir.Elliott Hughes2015-03-202-56/+56
|/ / / | | | | | | | | | Change-Id: I8f572a06ce59283e5bd444ae0491dea71b0ea304
* | | Merge "Add google3 style logging to libbase."Dan Albert2015-03-209-24/+864
|\ \ \
| * | | Add google3 style logging to libbase.Dan Albert2015-03-209-24/+864
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ART already had a flavor of this, but it was specialized for their use case a bit. Note that the logging.* tests are currently disabled for the device because there is no good way to capture the output of liblog. We can make something that will execute logcat and then then scan the output, but that's messy. Since we know it at least works on the host, we can add better device tests later. Change-Id: I47acd87a3312c0a5285b03f9c8dadef0c669f06a
* | | Merge "logd: statistics: missing comma"Mark Salyzyn2015-03-201-1/+1
|\ \ \
| * | | logd: statistics: missing commaMark Salyzyn2015-03-201-1/+1
|/ / / | | | | | | | | | | | | | | | regression from statistics rewrite series resulted in build breakage Change-Id: I71b532b23437b9b5f3af47b18c9110f3d7dda48a
* | | Merge "Remove /dev/alarm cruft from uptime."Elliott Hughes2015-03-201-56/+21
|\ \ \
| * | | Remove /dev/alarm cruft from uptime.Elliott Hughes2015-03-201-56/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Our uptime is very different from the regular one, and usefully so, so this code will live on. Remove dead bits. Also fix the annoying "1 days" bug while I'm here. Change-Id: Ied5403ba96dcc5eddd4d386b59c6fcdea3209881
* | | Merge "logd: optimize statistics"Mark Salyzyn2015-03-206-924/+281
|\ \ \
| * | | logd: optimize statisticsMark Salyzyn2015-03-206-924/+281
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | - Go back to basic requirements - Simplify - use hash tables to minimize memory impact Bug: 19608965 Change-Id: If7becb34354d6415e5c387ecea7d4109a15259c8
* | | Merge "Additional cleanup of start_device_log."Dan Albert2015-03-202-8/+19
|\ \ \ | |/ / |/| |
| * | Additional cleanup of start_device_log.Dan Albert2015-03-202-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses nnk's post commit review comments on https://android-review.googlesource.com/#/c/139381/ Remove unneeded code for creating /data/adb. Add an O_CLOEXEC. Move the closing of stdin out to main(). Append the pid of the current process to the log file to avoid clobbering the log if the process crashes and restarts within the same second. Change-Id: Ide0be86b4b33256486634c29ba02efaf10cf913d
* | | Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, ↵Dan Stoza2015-03-202-38/+201
|\ \ \ | |_|/ |/| | | | | color spaces"
| * | DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spacesEino-Ville Talvala2015-03-192-38/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First stage of adding a new dataSpace field for ANativeWindow, for communicating format- (and endpoint-) dependent information about graphics buffers. For most formats, dataSpace describes the color space of the buffer, while format describes the memory layout. For some formats, the dataSpace may also specify that the buffer contains depth measurements, encoded images, or other kinds of information that is not necessarily a simple 2D image. Rename the existing colorspace enumeration to dataspace, with an added dataspace for depth, and sRGB gamma-corrected and linear colorspaces. Add in a definition for Android depth point clouds as a variable-length list of float-triplet coordinates, as the underlying layout of buffers with format HAL_PIXEL_FORMAT_BLOB and dataSpace of HAL_DATASPACE_DEPTH. Also remove now-unnecessary sRGB HAL graphics formats, and remove the alias RAW_SENSOR that was left in to ease transition to RAW16. Cherry pick of I8797f67fb9c2b18da5975f2145303ca0bf98e62d with the following diff to maintain source compatibility: @@ -58,6 +58,11 @@ enum { HAL_PIXEL_FORMAT_RGB_565 = 4, HAL_PIXEL_FORMAT_BGRA_8888 = 5, + // Deprecated sRGB formats for source code compatibility + // Not for use in new code + HAL_PIXEL_FORMAT_sRGB_A_8888 = 0xC, + HAL_PIXEL_FORMAT_sRGB_X_8888 = 0xD, + /* * 0x100 - 0x1FF * @@ -189,6 +194,9 @@ enum { */ HAL_PIXEL_FORMAT_RAW16 = 0x20, + // Temporary alias for source code compatibility; do not use in new code + HAL_PIXEL_FORMAT_RAW_SENSOR = HAL_PIXEL_FORMAT_RAW16, + /* * Android RAW10 format: * Change-Id: I5c5ba98b297436f950e06a181eb0ff955747680f
* | | Merge "Clean up property setting code."Elliott Hughes2015-03-204-60/+38
|\ \ \
| * | | Clean up property setting code.Elliott Hughes2015-03-204-60/+38
|/ / / | | | | | | | | | | | | | | | In particular, ensure that all property_set failures are reported. Change-Id: Iab94a28bcba2346868c0f39bcfe26e55a2c55562
* | | Merge "Lose bootmode and console globals."Elliott Hughes2015-03-201-42/+17
|\ \ \
| * | | Lose bootmode and console globals.Elliott Hughes2015-03-201-42/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove some code marked "TODO: these are obsolete. We should delete them". Change-Id: I6255cee4cb6680bfcbc5b46366990309cba95037
* | | | Merge "Add init command to set verified properties"Sami Tolvanen2015-03-205-7/+47
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add init command to set verified propertiesSami Tolvanen2015-03-195-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a command that updates dm-verity state and sets partition.%.verified properties used by adb remount. This is needed in init since fs_mgr cannot set properties: I6a28cccb1ccce960841af20a4b20c32d424b5524 Change-Id: I0fdf5bc29c56690dcadff9d0eb216d3c68483538
* | | | Merge "Use mingw on Windows."Dan Albert2015-03-201-3/+0
|\ \ \ \
| * | | | Use mingw on Windows.Dan Albert2015-03-191-3/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_CLANG := true is a no-op on Linux/Darwin host builds, but apparently moves Windows binaries from mingw to clang, which is completely untested. Change-Id: Ibbc468d4a19a9e36bbcb93aa030fcc771af020ba
* | | | Merge "Use text based trace masks for adbd."Dan Albert2015-03-202-63/+88
|\ \ \ \
| * | | | Use text based trace masks for adbd.Dan Albert2015-03-192-63/+88
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the adbd trace mask had to be set as raw hex rather than with the colon separated list. We all have better things to do than memorize bitmasks, so make adbd use the same trace mask setting code as adb. Change-Id: I0bf0ab61c070d06d1cc2acf1ed90b2b77ccd261b
* | | | Merge "The generic failure case disappeared..."Dan Albert2015-03-202-0/+14
|\ \ \ \
| * | | | The generic failure case disappeared...Dan Albert2015-03-192-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was manifesting as a write to a full disk hanging indefinitely. Bug: 19846181 Change-Id: Ia581e0bbbb331c221bdb68882c238d0cb9f8a0b3
* | | | | Merge "File header cleanup."Dan Albert2015-03-2024-89/+148
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | File header cleanup.Dan Albert2015-03-1924-89/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sysdeps.h should always be included first. * TRACE_TAG needs to be defined before anything is included. * Some files were missing copyright headers. * Save precious bytes on my SSD by removing useless whitespace. Change-Id: I88980e6e00b5be1093806cf286740d9e4a033b94
* | | | | Merge "Parse boot properties from device tree"Elliott Hughes2015-03-191-5/+48
|\ \ \ \ \