summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "graphics: add android raw12 format"Yin-Chia Yeh2015-03-311-0/+50
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | graphics: add android raw12 formatYin-Chia Yeh2015-03-301-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
* | | | | | Merge "Use eventfd instead of pipe in Looper."Tim Kilbourn2015-03-301-2/+1
|\ \ \ \ \ \
| * | | | | | Use eventfd instead of pipe in Looper.Tim Kilbourn2015-03-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19933224 Change-Id: I6611e918db960bbb0e74f8308e10bdf79510b899
* | | | | | | am 4ce3c828: am 0cd316a4: am 5db3936d: Merge "Log more timing information ↵Elliott Hughes2015-03-281-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | from init." * commit '4ce3c8288ba030c2d2a80cf94ceb5d2f84a66d26': Log more timing information from init.
| * | | | | am 5db3936d: Merge "Log more timing information from init."Elliott Hughes2015-03-281-1/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '5db3936dbe6fa73d45ab0f02b7166f43680084d3': Log more timing information from init.
| | * | | | Log more timing information from init.Elliott Hughes2015-03-281-1/+3
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make important events in init's life NOTICE rather than INFO, and ensure that NOTICE events actually make it to the kernel log. Also fix the logging so that if you have a printf format string error, the compiler now catches it. Also give messages from init, ueventd, and watchdogd distinct tags. (Previously they'd all call themselves "init", and dmesg doesn't include pids, so you couldn't untangle them.) Also include the tag in SELinux messages. Bug: 19544788 Change-Id: Ica6daea065bfdb80155c52c0b06f346a7df208fe
* | | | | am 1188a4d8: am a596623f: am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on ↵Dan Albert2015-03-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | Windows." * commit '1188a4d856f6c840a2d39c44e35ba3f3cd86b3a5': O_CLOEXEC is O_NOINHERIT on Windows.
| * | | am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."Dan Albert2015-03-271-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '6ccfabcf5d547a04a1e6c5237f20670230a7f6a4': O_CLOEXEC is O_NOINHERIT on Windows.
| | * | O_CLOEXEC is O_NOINHERIT on Windows.Dan Albert2015-03-261-1/+1
| | | | | | | | | | | | | | | | Change-Id: I714aa08344fa10684c99651f953834086cc162c7
* | | | Merge "Fix comment in audio definitions header"Jean-Michel Trivi2015-03-251-1/+1
|\ \ \ \
| * | | | Fix comment in audio definitions headerJean-Michel Trivi2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I08f23f3feaacf4cb39e93992fe839f1c1f084363
* | | | | am bdabcf4c: am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."Christopher Ferris2015-03-241-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823': Fix mac sdk build.
| * | | | am 8e1697e7: Merge "Fix mac sdk build."Christopher Ferris2015-03-241-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '8e1697e7528f88985a5d702af53ef5d446f65fa1': Fix mac sdk build.
| | * | | Fix mac sdk build.Christopher Ferris2015-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add include files for types and functions that were not included properly. Change-Id: I4849f5bdf535c6eec9254228cf980c30d11a5a1b
* | | | | am 49da340d: am 4a342186: am 9f8093f8: Merge "Move gettid() into libcutils."Dan Albert2015-03-241-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '49da340d9ee272ff561b95288e4390d606b22ea9': Move gettid() into libcutils.
| * | | | am 9f8093f8: Merge "Move gettid() into libcutils."Dan Albert2015-03-231-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '9f8093f88850304fd225ae612c3df960d1d247fc': Move gettid() into libcutils.
| | * | | Move gettid() into libcutils.Dan Albert2015-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic8a15036833e6d129b7998d954b804be391de399
* | | | | am fb50475b: am a3d3144d: am fd26252d: Merge "Remove libzipfile."Narayan Kamath2015-03-241-58/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fb50475b71c34f6dce011d80d704aac99cf6c8ae': Remove libzipfile.
| * | | | am fd26252d: Merge "Remove libzipfile."Narayan Kamath2015-03-231-58/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'fd26252da2d736236bb1d80fc2e809421f9ffa4d': Remove libzipfile.
| | * | | Merge "Remove libzipfile."Narayan Kamath2015-03-231-58/+0
| | |\ \ \
| | | * | | Remove libzipfile.Narayan Kamath2015-03-201-58/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | No longer used and superceded by libziparchive. Change-Id: Iafbaa5affd0ffd4de02681c8bbe32b21c523ff49
| | * | | 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 "Revert "Sigh, more vendors linking against hidden APIs.""Vineeta Srivastava2015-03-231-13/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Sigh, more vendors linking against hidden APIs."Vineeta Srivastava2015-03-201-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31837298166e678d8e9c9fba1b30aea5abf1350f. Change-Id: I5c041d7438b64c4c258c414ca9a133075999e1b6
* | | | | am 012326fb: am b3b088e6: Merge "pixelflinger: make self-contained"Greg Hackmann2015-03-194-1664/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '012326fbe97d8d1570ab4521e697415bb6691c4a': pixelflinger: make self-contained
| * | | | pixelflinger: make self-containedGreg Hackmann2015-03-194-1664/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pixelflinger should not be used for new projects and should be moved out of system/core at some point. As the first step, move all its headers under system/core/libpixelflinger/include and update its Android.mk files so they're not referring to the absolute system/core path anymore. Change-Id: Idead273ab2c0450409d770f5402c4dba916192a9 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am c1e0bf0d: am 5aa097c8: Merge "Remove obsolete files from fs_config\'s list."Elliott Hughes2015-03-181-7/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c1e0bf0df36d1cd00104a0761d9fa251ebe4865c': Remove obsolete files from fs_config's list.
| * | | Remove obsolete files from fs_config's list.Elliott Hughes2015-03-181-7/+0
| | | | | | | | | | | | | | | | Change-Id: I83716f48754de889d811d74074f9a32dc666c05e
* | | | am 38f125b8: am 837a6739: Merge "Add variable length read to Backtrace."Christopher Ferris2015-03-181-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '38f125b8c4da6ccc95f19edb3867dfa09841207d': Add variable length read to Backtrace.
| * | | Add variable length read to Backtrace.Christopher Ferris2015-03-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included tests for this new feature. Changed the NULLs to nullptr in backtrace_test. Changed UniquePtr to std::unique_ptr in backtrace_test. Change-Id: I92375465b8f8ba84589834cc162db5915bf1be81
| * | | Revert "Revert "Create libbase.""Dan Albert2015-03-162-76/+0
| | | | | | | | | | | | | | | | This reverts commit a7870d88167f619e758b5bcd15b410d16da7c16b.
* | | | Merge "Revert "Revert "Create libbase."""Dan Albert2015-03-162-76/+0
|\ \ \ \
| * | | | Revert "Revert "Create libbase.""Dan Albert2015-03-162-76/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7870d88167f619e758b5bcd15b410d16da7c16b. (cherry picked from commit c007bc3856a4cf86b8f610eb045f26a9dedc2894)
* | | | | Merge "Sigh, more vendors linking against hidden APIs."Chet Haase2015-03-161-0/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Sigh, more vendors linking against hidden APIs.Jeff Sharkey2015-03-161-0/+13
| |/ / / | | | | | | | | | | | | | | | | Bug: 19762346 Change-Id: I6c0823bf69e3f7e854ffea7b5483d09bb7359ff6
* | | | Revert "pixelflinger: make self-contained"Paul Eastham2015-03-164-0/+1664
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 56350fe387e77824a1e360d39a22f983b0a8ab20. Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52
* | | | Merge "Definitions for broadcast radio."Eric Laurent2015-03-161-0/+247
|\ \ \ \
| * | | | Definitions for broadcast radio.Eric Laurent2015-03-131-0/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added common definitions for broadcast radio HAL and native service implementation. Change-Id: Id7061bcca5ac6d83a1b96ca8ccf6894c0364629c
* | | | | am 3f13e2fa: am 021efd1b: Merge "pixelflinger: make self-contained"Greg Hackmann2015-03-164-1664/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * commit '3f13e2fa3eaecc2571159cb4e3cc7dd28d2d536e': pixelflinger: make self-contained
| * | | | Merge "pixelflinger: make self-contained"Greg Hackmann2015-03-164-1664/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | pixelflinger: make self-containedGreg Hackmann2015-03-124-1664/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pixelflinger should not be used for new projects and should be moved out of system/core at some point. As the first step, move all its headers under system/core/libpixelflinger/include and update its Android.mk files so they're not referring to the absolute system/core path anymore. Change-Id: I7acc3ef5b2e21d8ba6fe939ea8d3ec4c41959591 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | | Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'"Lorenzo Colitti2015-03-161-20/+12
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-161-20/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I4d3d55dac794db8fa81d3048e41ac589920f43b8
| | * | | | | Refactor dhcp_utils for more flexible uses.Erik Kline2015-03-021-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate out fetching DHCP results from starting the daemon (for either discover or renew). Renamed dhcp_do_request() to dhcp_start(). Renamed dhcp_do_request_renew() to dhcp_start_renew(). Added new dhcp_get_results(). Callers of the prior versions of dhcp_do_request* now separately call dhcp_get_results(). Bug: 19422416 Change-Id: I05447853d444015e6014661dda1bb177b58fe463
* | | | | | | am 90a968f0: am dd581695: Merge "Revert "Create libbase.""Nicolas Geoffray2015-03-162-0/+76
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | * commit '90a968f0e3fb903aad41f6689c337a7e4a8d5c7b': Revert "Create libbase."
| * | | | | Revert "Create libbase."Nicolas Geoffray2015-03-162-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breaks internal master. This reverts commit 98ff77204cef9bb8f0f27420833233622060a09e. Change-Id: I18dc6021cb43efff8aa88486c2d980dc2b8eedba
* | | | | | am 517f65da: am a68c8148: Merge "Create libbase."Dan Albert2015-03-152-76/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '517f65daef177d06d7835300a1c23ce3409c0643': Create libbase.
| * | | | | Create libbase.Dan Albert2015-03-142-76/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move StringPrintf and the string based file I/O from libutils to libbase. Change-Id: I0297a6063874b9d92100e0dd5123fddfbda932fe