Tim Kilbourn
02fedb153d
Merge "Use eventfd instead of pipe in Looper."
2015-03-30 17:04:52 +00:00
Elliott Hughes
1ef8498d02
am 4ce3c828
: am 0cd316a4
: am 5db3936d
: Merge "Log more timing information from init."
...
* commit '4ce3c8288ba030c2d2a80cf94ceb5d2f84a66d26':
Log more timing information from init.
2015-03-28 17:10:38 +00:00
Elliott Hughes
0cd316a46b
am 5db3936d
: Merge "Log more timing information from init."
...
* commit '5db3936dbe6fa73d45ab0f02b7166f43680084d3':
Log more timing information from init.
2015-03-28 16:50:35 +00:00
Elliott Hughes
da40c00137
Log more timing information from init.
...
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
2015-03-28 00:25:22 -07:00
Tim Kilbourn
8892ce6383
Use eventfd instead of pipe in Looper.
...
Bug: 19933224
Change-Id: I6611e918db960bbb0e74f8308e10bdf79510b899
2015-03-27 09:15:43 -07:00
Dan Albert
ac197dd2af
am 1188a4d8
: am a596623f
: am 6ccfabcf
: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
...
* commit '1188a4d856f6c840a2d39c44e35ba3f3cd86b3a5':
O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:55:14 +00:00
Dan Albert
a596623fbf
am 6ccfabcf
: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
...
* commit '6ccfabcf5d547a04a1e6c5237f20670230a7f6a4':
O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:34:45 +00:00
Dan Albert
c6b30f376d
O_CLOEXEC is O_NOINHERIT on Windows.
...
Change-Id: I714aa08344fa10684c99651f953834086cc162c7
2015-03-26 23:24:15 -07:00
Jean-Michel Trivi
187f67695a
Merge "Fix comment in audio definitions header"
2015-03-25 01:14:54 +00:00
Jean-Michel Trivi
1ede5537a3
Fix comment in audio definitions header
...
Change-Id: I08f23f3feaacf4cb39e93992fe839f1c1f084363
2015-03-24 17:17:45 -07:00
Christopher Ferris
ad27dd98ae
am bdabcf4c
: am 730d7c53
: am 8e1697e7
: Merge "Fix mac sdk build."
...
* commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823':
Fix mac sdk build.
2015-03-24 05:20:50 +00:00
Christopher Ferris
730d7c530a
am 8e1697e7
: Merge "Fix mac sdk build."
...
* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
Fix mac sdk build.
2015-03-24 05:00:51 +00:00
Christopher Ferris
fc3576f675
Fix mac sdk build.
...
Add include files for types and functions that were not included properly.
Change-Id: I4849f5bdf535c6eec9254228cf980c30d11a5a1b
2015-03-23 21:40:30 -07:00
Dan Albert
b3edb9d3a1
am 49da340d
: am 4a342186
: am 9f8093f8
: Merge "Move gettid() into libcutils."
...
* commit '49da340d9ee272ff561b95288e4390d606b22ea9':
Move gettid() into libcutils.
2015-03-24 02:59:21 +00:00
Narayan Kamath
7d1c434e1f
am fb50475b
: am a3d3144d
: am fd26252d
: Merge "Remove libzipfile."
...
* commit 'fb50475b71c34f6dce011d80d704aac99cf6c8ae':
Remove libzipfile.
2015-03-24 01:31:47 +00:00
Dan Albert
4a3421862e
am 9f8093f8
: Merge "Move gettid() into libcutils."
...
* commit '9f8093f88850304fd225ae612c3df960d1d247fc':
Move gettid() into libcutils.
2015-03-23 21:19:42 +00:00
Dan Albert
7dfb61dcdc
Move gettid() into libcutils.
...
Change-Id: Ic8a15036833e6d129b7998d954b804be391de399
2015-03-23 13:01:21 -07:00
Vineeta Srivastava
631945200e
Merge "Revert "Sigh, more vendors linking against hidden APIs.""
2015-03-23 15:52:24 +00:00
Narayan Kamath
a3d3144def
am fd26252d
: Merge "Remove libzipfile."
...
* commit 'fd26252da2d736236bb1d80fc2e809421f9ffa4d':
Remove libzipfile.
2015-03-23 10:55:33 +00:00
Narayan Kamath
fd26252da2
Merge "Remove libzipfile."
2015-03-23 10:49:07 +00:00
Vineeta Srivastava
995f45e30e
Revert "Sigh, more vendors linking against hidden APIs."
...
This reverts commit 3183729816
.
Change-Id: I5c041d7438b64c4c258c414ca9a133075999e1b6
2015-03-20 23:51:36 +00:00
Dan Stoza
ca87790cdc
Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces"
2015-03-20 18:28:00 +00:00
Narayan Kamath
766adf9f31
Remove libzipfile.
...
No longer used and superceded by libziparchive.
Change-Id: Iafbaa5affd0ffd4de02681c8bbe32b21c523ff49
2015-03-20 17:59:51 +00:00
Eino-Ville Talvala
b93343d199
DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
...
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
2015-03-19 13:19:48 -07:00
Greg Hackmann
7edc1f0a84
am 012326fb
: am b3b088e6
: Merge "pixelflinger: make self-contained"
...
* commit '012326fbe97d8d1570ab4521e697415bb6691c4a':
pixelflinger: make self-contained
2015-03-19 19:57:44 +00:00
Greg Hackmann
38eb58d2a8
pixelflinger: make self-contained
...
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>
2015-03-19 12:34:35 -07:00
Elliott Hughes
2e671e1c00
am c1e0bf0d
: am 5aa097c8
: Merge "Remove obsolete files from fs_config\'s list."
...
* commit 'c1e0bf0df36d1cd00104a0761d9fa251ebe4865c':
Remove obsolete files from fs_config's list.
2015-03-18 18:11:49 +00:00
Elliott Hughes
3c292007c1
Remove obsolete files from fs_config's list.
...
Change-Id: I83716f48754de889d811d74074f9a32dc666c05e
2015-03-18 10:47:20 -07:00
Christopher Ferris
4f1bb82b8a
am 38f125b8
: am 837a6739
: Merge "Add variable length read to Backtrace."
...
* commit '38f125b8c4da6ccc95f19edb3867dfa09841207d':
Add variable length read to Backtrace.
2015-03-18 10:57:38 +00:00
Christopher Ferris
2b4a63fc6a
Add variable length read to Backtrace.
...
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
2015-03-17 14:56:02 -07:00
Dan Albert
dbac8ffd2d
Merge "Revert "Revert "Create libbase."""
2015-03-16 21:03:19 +00:00
Dan Albert
a83ba64a23
Revert "Revert "Create libbase.""
...
This reverts commit a7870d8816
.
(cherry picked from commit c007bc3856
)
2015-03-16 13:48:07 -07:00
Chet Haase
a5e351cbc2
Merge "Sigh, more vendors linking against hidden APIs."
2015-03-16 20:12:10 +00:00
Paul Eastham
fd46fe102a
Revert "pixelflinger: make self-contained"
...
This reverts commit 56350fe387
.
Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52
2015-03-16 12:46:39 -07:00
Jeff Sharkey
3183729816
Sigh, more vendors linking against hidden APIs.
...
Bug: 19762346
Change-Id: I6c0823bf69e3f7e854ffea7b5483d09bb7359ff6
2015-03-16 12:14:40 -07:00
Eric Laurent
4e839b98b7
Merge "Definitions for broadcast radio."
2015-03-16 18:15:50 +00:00
Greg Hackmann
6205750c75
am 3f13e2fa
: am 021efd1b
: Merge "pixelflinger: make self-contained"
...
* commit '3f13e2fa3eaecc2571159cb4e3cc7dd28d2d536e':
pixelflinger: make self-contained
2015-03-16 18:04:05 +00:00
Greg Hackmann
021efd1bd4
Merge "pixelflinger: make self-contained"
2015-03-16 17:46:31 +00:00
Dan Albert
c007bc3856
Revert "Revert "Create libbase.""
...
This reverts commit a7870d8816
.
2015-03-16 10:08:46 -07:00
Lorenzo Colitti
3e1c17e81d
Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'"
2015-03-16 12:38:33 +00:00
Nicolas Geoffray
a6000e81dc
am 90a968f0
: am dd581695
: Merge "Revert "Create libbase.""
...
* commit '90a968f0e3fb903aad41f6689c337a7e4a8d5c7b':
Revert "Create libbase."
2015-03-16 11:25:38 +00:00
Nicolas Geoffray
a7870d8816
Revert "Create libbase."
...
Breaks internal master.
This reverts commit 98ff77204c
.
Change-Id: I18dc6021cb43efff8aa88486c2d980dc2b8eedba
2015-03-16 11:07:29 +00:00
Vinit Deshpande
ac56e6ba1d
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
...
Change-Id: I4d3d55dac794db8fa81d3048e41ac589920f43b8
2015-03-16 01:30:49 -07:00
Dan Albert
06d60af714
am 517f65da
: am a68c8148
: Merge "Create libbase."
...
* commit '517f65daef177d06d7835300a1c23ce3409c0643':
Create libbase.
2015-03-15 22:33:53 +00:00
Elliott Hughes
51d98035b1
am c8d5e230
: am f1c2ba49
: Merge "Remove unused header file."
...
* commit 'c8d5e2307badc6bfcb76c4dec43a07d6b9d885cb':
Remove unused header file.
2015-03-15 22:33:51 +00:00
Dan Albert
98ff77204c
Create libbase.
...
Move StringPrintf and the string based file I/O from libutils to
libbase.
Change-Id: I0297a6063874b9d92100e0dd5123fddfbda932fe
2015-03-14 16:36:18 -07:00
Elliott Hughes
c2f0ed64ce
Remove unused header file.
...
This library no longer exists.
Change-Id: I5582b41b70691171b1ac5f2bffd623f2b2fc10e5
2015-03-14 09:28:49 -07:00
Eric Laurent
699ce298ca
Definitions for broadcast radio.
...
Added common definitions for broadcast radio
HAL and native service implementation.
Change-Id: Id7061bcca5ac6d83a1b96ca8ccf6894c0364629c
2015-03-13 15:35:35 -07:00
Jeff Sharkey
707d4f2ee8
Merge "Define enum class for NetlinkEvent actions."
2015-03-13 20:47:47 +00:00
Jeff Sharkey
e4f394087d
Define enum class for NetlinkEvent actions.
...
This lets us use it for switch statements, and gives us stronger
type safety.
Change-Id: Idb3ad7098657a09f13c95dc7070611d35ede66ae
2015-03-13 13:27:56 -07:00