Commit graph

1852 commits

Author SHA1 Message Date
Rom Lemarchand
be7aca60f3 Move audio includes to system/media/audio
Change-Id: I21bed541dbd81127e6b8340f7f14b5523f7c5c0d
2015-04-03 15:12:01 -07:00
Elliott Hughes
3bb04bd804 am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."
* commit '6c7c6d0420ca837b81927b2f7c08cd9d92533043':
  Only Windows doesn't have %zd.
2015-04-03 20:58:29 +00:00
Elliott Hughes
7c1945254e am ea975880: Merge "Only Windows doesn\'t have %zd."
* commit 'ea975880112c27293800ede36e0323ff2a7b9322':
  Only Windows doesn't have %zd.
2015-04-03 20:30:46 +00:00
Elliott Hughes
146c244613 Only Windows doesn't have %zd.
Change-Id: Ie09619df212cf7c8aa18a6d46c3e6b6ca3f478cf
2015-04-03 12:53:36 -07:00
Elliott Hughes
16bcaac5fd am cd868370: am b2c3473d: am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
* commit 'cd8683709c2d1bcac7e3b9de827a2dfc8f24bf09':
  Just use snprintf for android_get_control_socket.
2015-04-03 14:53:01 +00:00
Elliott Hughes
bbc6e1bf86 am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit 'b45733319dc269375d599da894eecd2ffa4211ff':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-03 14:52:33 +00:00
Elliott Hughes
b2c3473d35 am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
* commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614':
  Just use snprintf for android_get_control_socket.
2015-04-03 03:45:30 +00:00
Elliott Hughes
edc49d7b98 Just use snprintf for android_get_control_socket.
Change-Id: I3d0da03847f79c9f9b2cfd7189a07f63b17fc4a2
2015-04-02 17:42:56 -07:00
Elliott Hughes
adc1010249 am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit '4c1d4a0e8ec344799813ce5e6642946839e0036a':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-02 23:54:37 +00:00
Phil Burk
7c6f796df4 Merge "audio.h: add AUDIO_FORMAT_DTS" 2015-04-02 23:10:23 +00:00
Elliott Hughes
2040031f7b Be more intention-revealing with libcutils' strlcpy.
Several people have been independently confused about when this gets
built and why over the past couple of days.

Change-Id: I2d4a02f66e24c0734327585b7d27e50a344b1e94
2015-04-02 15:39:33 -07:00
Elliott Hughes
1c41dadef3 am 797b246f: am a1f69f18: am 21593186: Merge "Move all libcutils tests into the gtests."
* commit '797b246ff374e0fc3066a45545b8156f50f23267':
  Move all libcutils tests into the gtests.
2015-04-02 22:07:15 +00:00
Elliott Hughes
a1f69f1808 am 21593186: Merge "Move all libcutils tests into the gtests."
* commit '2159318647b6032a9d752012b923c579dc1f80da':
  Move all libcutils tests into the gtests.
2015-04-02 21:35:18 +00:00
Elliott Hughes
af98efbd15 Move all libcutils tests into the gtests.
This also fixes the bug where we were always testing against the fake
strlcpy we provide for glibc/Windows rather than the Android one.

This also removes some unnecessary library dependencies.

This also builds all the cutils tests for the host (static and dynamic).

Change-Id: Icd129d5b025c0ca801be5acf31a54ecd88608df9
2015-04-02 14:25:55 -07:00
Phil Burk
103c2d2203 audio.h: add AUDIO_FORMAT_DTS
Bug: 18292317
Change-Id: Icb3855e958d02e3b03517ac0fcf7de743d896c12
Signed-off-by: Phil Burk <philburk@google.com>
2015-04-01 16:54:41 -07:00
Richard Uhler
3f80c4d974 am 88defca0: am b3b1757f: am 0c266ef2: Merge "Define atrace_* functions for both target and host."
* commit '88defca0f5ee64143a83021e637b53908ed109ed':
  Define atrace_* functions for both target and host.
2015-04-01 18:04:49 +00:00
Richard Uhler
b3b1757fd9 am 0c266ef2: Merge "Define atrace_* functions for both target and host."
* commit '0c266ef2d7e137efbd83366a98a861d9770fbf06':
  Define atrace_* functions for both target and host.
2015-04-01 17:37:10 +00:00
Richard Uhler
0c266ef2d7 Merge "Define atrace_* functions for both target and host." 2015-04-01 17:29:34 +00:00
Christopher Ferris
7d4347389c am 22790dfc: am 246e9d50: am 9dc41d5d: Merge "Refactor the code."
* commit '22790dfcfceebc537ffd3eb0a15fc0512f036091':
  Refactor the code.
2015-03-31 23:01:28 +00:00
Christopher Ferris
246e9d502c am 9dc41d5d: Merge "Refactor the code."
* commit '9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd':
  Refactor the code.
2015-03-31 21:15:52 +00:00
Christopher Ferris
9dc41d5d34 Merge "Refactor the code." 2015-03-31 21:11:36 +00:00
Tim Kilbourn
eeb212df71 Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." 2015-03-31 20:23:19 +00:00
Yin-Chia Yeh
3fcb735030 Merge "graphics: add android raw12 format" 2015-03-31 18:27:11 +00:00
Christopher Ferris
2c43cff01d Refactor the code.
The object hierarchy was confusing and convoluted. This removes
a lot of unnecessary code, and consolidates the BacktraceCurrent
and BacktraceThread code into BacktraceCurrent.

Change-Id: I01c8407d493712a48169df49dd3ff46db4a7c3ae
2015-03-31 10:51:44 -07:00
Yin-Chia Yeh
9a5eeba588 graphics: add android raw12 format
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
2015-03-30 16:35:56 -07:00
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
Richard Uhler
7d451ab96d Define atrace_* functions for both target and host.
This change defines atrace_* functions for the host that act as
no-ops, which makes it easier to add tracing in ART.

Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
2015-03-27 14:58:30 -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
Tim Kilbourn
83e6f2606b Allow inputflinger to have CAP_BLOCK_SUSPEND.
Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606
2015-03-25 09:25:33 -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
Jeff Brown
e7d54f80cb Fix issues related to removing Looper callbacks after close.
When a file descriptor is closed before removing it from the
epoll set, it will normally be removed automatically from the
epoll set by the kernel.  However if there exists a duplicate
then the original file descriptor may remain in the set and
continue to receive events until all duplicates have been closed.

Unfortunately due to kernel limitations we need to rebuild the epoll
set from scratch because it may contain an old file handle that we are
now unable to remove since its file descriptor is no longer valid.
No such problem would have occurred if we were using the poll system
call instead, but that approach carries others disadvantages.

Bug: 19715279
Change-Id: If1ab8ebda0825755a416d513e888942a02ee3948
2015-03-12 19:44:49 -07:00
Greg Hackmann
56350fe387 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: I7acc3ef5b2e21d8ba6fe939ea8d3ec4c41959591
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-12 13:02:38 -07:00
Jeff Brown
7a0310ef67 Fixed subtle bugs related to file descriptor recycling.
Added code to protect against situations that may occur when a
Looper callback has the side-effect of closing the file descriptor that
it is watching before it returns.  This code pattern is very
convenient for implementation but it does expose issues in how
the list of callbacks is maintained.  In particular, we
need to watch out for file descriptors which have been reused.

This change may resolve previously unexplained ANRs associated with
log messages such as: "Error modifying epoll events for fd 44, errno=2"

Bug: 10349083
Change-Id: I20eedf6ffbdeda382653ca0104962505194741b0
2015-03-11 15:00:36 -07:00
Jeff Brown
27e5721860 Rename Looper::isIdling() to isPolling() to resolve confusion.
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
2015-03-11 15:00:36 -07:00
Andy Hung
17e8158635 Merge "Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT" 2015-03-10 23:25:02 +00:00
Andy Hung
4ff72b52a2 Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT
Should be Q8.23 (24 bits packed in the least significant
3 bytes).

Change-Id: If5ca27c27249487e28c0be42ebdd283308ff8552
2015-03-10 16:01:49 -07:00
Eino-Ville Talvala
5938f30921 Merge "Add ANativeWindow dataSpace; update graphics formats, color spaces" 2015-03-06 22:13:06 +00:00
Mark Salyzyn
ad966e88f5 am ddd1ea71: am e79201e4: am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
* commit 'ddd1ea71b4260981fb4814da4b6580c16bd8bb7f':
  liblog: logprint use <endian.h>
  private: Add event payload structures to android_logger.h
2015-03-04 23:24:38 +00:00
Mark Salyzyn
e79201e4cb am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
* commit '4487c605eaeea2b85c8511fe915a286c3aaf4da4':
  liblog: logprint use <endian.h>
  private: Add event payload structures to android_logger.h
2015-03-04 22:44:41 +00:00
Mark Salyzyn
fa1c063feb private: Add event payload structures to android_logger.h
- common android_event_header_t
- android_event_int_t ANDROID_TYPE_INT payload
- android_log_event_int_t single ANDROID_TYPE_INT event
- android_event_long_t ANDROID_TYPE_LONG payload
- android_log_event_long_t single ANDROID_TYPE_LONG event
- android_event_string_t ANDROID_TYPE_STRING payload
- android_log_event_string_t single ANDROID_TYPE_STRING event

Change-Id: I9e5fccba38e3f230c2c4ec7dec51ed110c460f95
2015-03-04 12:48:04 -08:00
Eino-Ville Talvala
03743414cb 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.

Change-Id: I8797f67fb9c2b18da5975f2145303ca0bf98e62d
2015-03-04 11:59:51 -08:00
Erik Kline
c2291a7ed3 Refactor dhcp_utils for more flexible uses.
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
2015-03-02 12:26:53 +09:00
Mark Salyzyn
75a2283d6b am 8c52e3b7: am d851c80f: am ae19b631: Merge "liblog: add pstore read"
* commit '8c52e3b79f8ca9ccef5d562f16a0c275f58b8538':
  liblog: add pstore read
2015-02-26 17:42:31 +00:00
Mark Salyzyn
d851c80f0d am ae19b631: Merge "liblog: add pstore read"
* commit 'ae19b63168d1b958898180979156e2a4169ee4c2':
  liblog: add pstore read
2015-02-26 17:29:05 +00:00
Mark Salyzyn
6eef417119 liblog: add pstore read
Used to pull the Android log messages after a reboot. Adding
an ANDROID_LOG_PSTORE flag to the mode parameter in calls to
android_logger_list_alloc() and android_logger_list_alloc_time().
The side effects are that android_logger_clear() and
android_logger_list_read() will react with the user space
pstore driver. Forms a companion to the pstore console logs.

Change-Id: I7bb07b87b3bf73f059a21af3f810af37c7715b6d
2015-02-26 06:37:35 -08:00
Mark Salyzyn
581a20b8ed am ac947104: am f5579498: am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
* commit 'ac9471041e5c2d2903ce6470a35ba5b3baf80aa0':
  liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:24:17 +00:00
Mark Salyzyn
f5579498d9 am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
* commit '110166c1dbcbe26e510ac3fdaf2e1fcc7efbcc4e':
  liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:12:48 +00:00
Mark Salyzyn
2d3f38a6b8 liblog: introduce ANDROID_LOG_* flags
Move away from using POSIX open(2) flags and introduce ANDROID_LOG_* flags to
replace them. Add security by preventing random mode flags from getting into
underlying POSIX calls. ANDROID_LOG_* flags overlap POSIX O_* flag definitions.

Change-Id: Ib32bb64c287e8bf150be62242e1ba46bb37839fc
2015-02-25 17:44:18 +00:00
Narayan Kamath
9d8889c598 am f6fae931: am f9df4b13: am c40cf1ce: Merge "Remove useless refCounting from FileMap."
* commit 'f6fae93164ec8505153241b24ccce85cc4ac0f9e':
  Remove useless refCounting from FileMap.
2015-02-24 13:09:47 +00:00
Narayan Kamath
f9df4b13bc am c40cf1ce: Merge "Remove useless refCounting from FileMap."
* commit 'c40cf1ce9d6910685bf2242c1db390af00684d9d':
  Remove useless refCounting from FileMap.
2015-02-24 12:56:45 +00:00
Narayan Kamath
6832a7a4e0 Remove useless refCounting from FileMap.
Nobody ever called acquire() so release() was always
equivalent to delete. Just use delete instead so that
people can use unique_ptr directly (or shared_ptr if
they really want refcounts).

Change-Id: I9e3ad5e0f6a4fcc4e02e5a2ff7ef9514fe234415
2015-02-23 15:49:43 +00:00
Andreas Gampe
9f08ce8886 am f320e8e5: am ed318bff: Merge "log.h: Fix typo"
* commit 'f320e8e53df75ba50db755c89843251e481dc696':
  log.h: Fix typo
2015-02-11 02:48:05 +00:00
Mark Salyzyn
ee632f734a am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41
* commit '8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION
2015-02-11 02:48:04 +00:00
Mark Salyzyn
2044a34ca7 am 2671ffb6: am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"
* commit '2671ffb6191aadf17cd8770ffcc235bc0591e03f':
  liblog: add __android_log_is_loggable()
2015-02-11 02:48:01 +00:00
Andreas Gampe
f320e8e53d am ed318bff: Merge "log.h: Fix typo"
* commit 'ed318bff41c4515ca79a11afb97507a452e9fcd3':
  log.h: Fix typo
2015-02-10 16:53:30 +00:00
Mark Salyzyn
8a5198a150 am fd867303: Merge changes I420b5b8a,Ica23fe41
* commit 'fd867303861eb25bf7973739e71dc29b6356a336':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION
2015-02-10 16:53:24 +00:00
Mark Salyzyn
2671ffb619 am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"
* commit '95f7ecbd38df680c5295295bd2277f4b26865f1f':
  liblog: add __android_log_is_loggable()
2015-02-10 16:52:48 +00:00
Andreas Gampe
f45bbe496f log.h: Fix typo
Change-Id: I6b5e9bc9d40e5e5ecf9f50f7392675391e6f18e6
2015-02-09 16:13:33 -08:00
Mark Salyzyn
1df92e523e log.h: wrap android_testLog around __android_log_is_loggable
- take android_testLog from the bonepile and resurrect
- android_testLog is used, and makes sense in its current context
  as a holder for Android Logging policy.
- Default level when not specified is ANDROID_LOG_VERBOSE for
  eng and userdebug, and ANDROID_LOG_DEBUG for user.

NB: Properties, which are associated with __android_log_is_loggable are
not to be adjusted in user release; it would be useful at that juncture to
return a constant of (0) for VERBOSE, and a (1) for others on user builds.
Or default level to drop to ANDROID_LOG_DEBUG for all in future.

Bug: 17760225
Change-Id: I420b5b8a94d53d664c6a8b13546ebc424a147923
2015-02-09 15:37:32 -08:00
Mark Salyzyn
f5af82edf3 log.h: deprecate CONDITION
- replace CONDITION with __predict_false to match with bionic

Change-Id: Ica23fe41cf9a7ea5eaf1b8552780af9ec7827808
2015-02-09 15:25:48 -08:00
Mark Salyzyn
956870518e liblog: add __android_log_is_loggable()
- Add new liblog API __android_log_is_loggable(prio, tag, def)
- future plan to integrate this into the runtime checks and into
  the logd daemon for filtration. Inert for now.

Bug: 17760225
Change-Id: I16395b4d42acc08f0209f55a1cbf87b0b2112898
2015-02-09 22:12:59 +00:00
Christopher Ferris
14b964f52e am e6ed63e6: am c9c401e6: Merge "Move map data into backtrace data proper."
* commit 'e6ed63e610c5e6a56b04a5168e873dfa48c73aec':
  Move map data into backtrace data proper.
2015-02-09 04:13:37 +00:00
Elliott Hughes
bc32de07e9 am b164b103: am 5e753100: Merge "Clean up reading and writing in init."
* commit 'b164b103ebdcb2b567079f30e38d878a21a9b632':
  Clean up reading and writing in init.
2015-02-09 04:13:02 +00:00
Christopher Ferris
e6ed63e610 am c9c401e6: Merge "Move map data into backtrace data proper."
* commit 'c9c401e64ba00e8fa295cae30b2b0035fae1183a':
  Move map data into backtrace data proper.
2015-02-06 23:43:11 +00:00
Christopher Ferris
c9c401e64b Merge "Move map data into backtrace data proper." 2015-02-06 23:29:00 +00:00
Christopher Ferris
12385e3ad0 Move map data into backtrace data proper.
The backtrace structure used to include a pointer to a backtrace_map_t
that represented the map data for a particular pc. This introduced a
race condition where the pointer could be discarded, but the backtrace
structure still contained a pointer to garbage memory. Now all of the map
information is right in the structure.

Bug: 19028453
Change-Id: If7088a73f3c6bf1f3bc8cdd2bb4b62e7cab831c0
2015-02-06 15:00:09 -08:00
Elliott Hughes
b164b103eb am 5e753100: Merge "Clean up reading and writing in init."
* commit '5e753100c32c7b42ae4306a8023c419defd34c4e':
  Clean up reading and writing in init.
2015-02-06 22:33:18 +00:00
Elliott Hughes
f682b4786a Clean up reading and writing in init.
This isn't particularly useful in and of itself, but it does introduce the
first (trivial) unit test, improves the documentation (including details
about how to debug init crashes), and made me aware of how unpleasant the
existing parser is.

I also fixed a bug in passing --- unless you thought the "peboot" and "pm"
commands were features...

Bug: 19217569
Change-Id: I6ab76129a543ce3ed3dab52ef2c638009874c3de
2015-02-06 14:20:30 -08:00
Elliott Hughes
07e0ee7cf4 am dcbeb41a: am d558530b: Merge "Fix Windows build."
* commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5':
  Fix Windows build.
2015-02-05 20:15:04 +00:00
Elliott Hughes
dcbeb41a67 am d558530b: Merge "Fix Windows build."
* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
  Fix Windows build.
2015-02-05 18:51:07 +00:00
Paul McLean
9d13e782c6 Merge "Adding name field to AudioPort for enum/select API." 2015-02-05 18:13:48 +00:00
Elliott Hughes
d79801d60d Fix Windows build.
Take 2. Probably should have done this in the beginning, but thought I was
being clever.

Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
2015-02-05 08:21:37 -08:00
Elliott Hughes
495952fef2 am 44fdd5d1: am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
* commit '44fdd5d15a8851e4053af168e7235b30a5f4d34d':
  Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:36:47 +00:00
Elliott Hughes
44fdd5d15a am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
* commit '27d28d3baff860d1fd936a5fcf2d920577c52575':
  Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:31:31 +00:00
Elliott Hughes
202f024dee Add a WriteStringToFile overload that cares about permissions.
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
Elliott Hughes
814cb64fb4 am 8a2634c2: am 55732f49: Merge "android_reboot should take a const char*."
* commit '8a2634c2ab3914abeb43e0edf46fa69852b6b15d':
  android_reboot should take a const char*.
2015-02-04 15:03:49 +00:00
Elliott Hughes
8a2634c2ab am 55732f49: Merge "android_reboot should take a const char*."
* commit '55732f49287a75f9baabe9f150443aec9234c90d':
  android_reboot should take a const char*.
2015-02-04 01:20:40 +00:00
Elliott Hughes
0068da6a93 android_reboot should take a const char*.
The kernel argument is actually a void*, but it's only read from.

Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
2015-02-03 15:44:16 -08:00
Elliott Hughes
25c2f84c5e am 14fcc4c6: am e44d25d6: Merge "Add Google-style StringPrintf."
* commit '14fcc4c66cbd7e55a12315d985b0723ef4a527ff':
  Add Google-style StringPrintf.
2015-02-03 23:41:33 +00:00
Elliott Hughes
14fcc4c66c am e44d25d6: Merge "Add Google-style StringPrintf."
* commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222':
  Add Google-style StringPrintf.
2015-02-03 23:33:39 +00:00
Elliott Hughes
e44d25d645 Merge "Add Google-style StringPrintf." 2015-02-03 23:23:11 +00:00
Elliott Hughes
6b3be2902d Add Google-style StringPrintf.
Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
2015-02-03 15:21:07 -08:00
Elliott Hughes
e17fc7cf3c am c3bf8d85: am 9fc43358: Merge "Extra Win32 compatibility."
* commit 'c3bf8d85b58c4a4711983adcd6321a580d6835b1':
  Extra Win32 compatibility.
2015-02-03 22:56:42 +00:00
Elliott Hughes
c3bf8d85b5 am 9fc43358: Merge "Extra Win32 compatibility."
* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
  Extra Win32 compatibility.
2015-02-03 22:36:57 +00:00
Elliott Hughes
714196d05c Extra Win32 compatibility.
Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
2015-02-03 14:26:58 -08:00
Elliott Hughes
a803b7697f am 813d0ac1: am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
* commit '813d0ac13614b6199f407762f679afc9f439be7e':
  Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:39:30 +00:00
Elliott Hughes
813d0ac136 am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
  Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:33:00 +00:00
Elliott Hughes
dec12b2b71 Add Google-style ReadFileToString and WriteStringToFile.
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
2015-02-03 12:18:11 -08:00
Elliott Hughes
d3e3bfd6c0 am dbf6f33e: am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
* commit 'dbf6f33e84a4de9944b782ec079ba8b51f3e9c25':
  Revert "Remove netcfg's unused options."
2015-02-03 20:15:17 +00:00
Elliott Hughes
dbf6f33e84 am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
* commit '2b2b7632f55ca73562361cf4d06e60e7b62f7ff4':
  Revert "Remove netcfg's unused options."
2015-02-03 20:09:30 +00:00
Elliott Hughes
c463025a19 Revert "Remove netcfg's unused options."
This reverts commit f8e83054cb.

Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Elliott Hughes
d58fe3880e am b862d3e8: am 6a728fde: Merge "Remove netcfg\'s unused options."
* commit 'b862d3e8eb92323983020830f3d39240d6cfbee3':
  Remove netcfg's unused options.
2015-02-03 19:18:43 +00:00
Elliott Hughes
d4e71f154e am 5b253e55: am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
* commit '5b253e55e0ac4d6b935036c1e8aa5151caf09ccc':
  Revert "Remove netcfg's unused options."
2015-02-03 19:18:42 +00:00
Elliott Hughes
85ed30d881 am 1ddbd76b: am 67900498: Merge "Remove netcfg\'s unused options."
* commit '1ddbd76bd8eededb5d854dc588d3cef68cdc0c69':
  Remove netcfg's unused options.
2015-02-03 19:18:41 +00:00
Elliott Hughes
b862d3e8eb am 6a728fde: Merge "Remove netcfg\'s unused options."
* commit '6a728fde77d1367318c79e5b182f0cb316872a37':
  Remove netcfg's unused options.
2015-02-03 19:16:42 +00:00
Elliott Hughes
5b253e55e0 am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
  Revert "Remove netcfg's unused options."
2015-02-03 19:16:42 +00:00
Elliott Hughes
1ddbd76bd8 am 67900498: Merge "Remove netcfg\'s unused options."
* commit '67900498cff54c8116b3f7afc84e046d98bb17e4':
  Remove netcfg's unused options.
2015-02-03 19:12:53 +00:00
Elliott Hughes
f8e83054cb Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00
Elliott Hughes
ca77255c26 Revert "Remove netcfg's unused options."
This reverts commit 24c1885bc1.

Change-Id: Iaae6502e2db90d67b4275faa104cfc6a0abc65c6
2015-02-03 19:07:43 +00:00
Elliott Hughes
24c1885bc1 Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Ie0aecf5b18bd854cfb5878b6cfdd7160c9f42526
2015-02-02 14:39:42 -08:00
Paul McLean
9bc8190442 Adding name field to AudioPort for enum/select API.
Change-Id: I9e7a6476f7f2658c6ea1ac255683fefb9f598a2d
2015-02-02 12:45:38 -08:00
Dmitriy Ivanov
6458c0dc0a am bbbe9885: am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
* commit 'bbbe988539a525e56809cc542876f63aef89fbac':
  Add close_file flag to OpenArchiveFd()
2015-02-02 19:32:02 +00:00
Dmitriy Ivanov
bbbe988539 am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
* commit '7cb19579bc22bf38e15b970f801f8065d629611d':
  Add close_file flag to OpenArchiveFd()
2015-02-02 19:14:17 +00:00
Dmitriy Ivanov
40b52b2c88 Add close_file flag to OpenArchiveFd()
* We should be able to keep fd alive after CloseArchive()

Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-01-30 17:57:13 -08:00
Yabin Cui
3f83554d22 am 631965a3: am e862350b: Merge "Kill HAVE_PTHREADS."
* commit '631965a32eb503dc6782a298eb534881aa3697b8':
  Kill HAVE_PTHREADS.
2015-01-28 00:42:36 +00:00
Yabin Cui
631965a32e am e862350b: Merge "Kill HAVE_PTHREADS."
* commit 'e862350bb2eb3d3eda526da7f3b6d5c2dd40a445':
  Kill HAVE_PTHREADS.
2015-01-27 22:45:14 +00:00
Yabin Cui
4a6e5a3b64 Kill HAVE_PTHREADS.
Bug: 19083585
Change-Id: Ic09eb3dd250bc5c5b63cac7998f99f5fa007f407
2015-01-27 14:23:22 -08:00
Mark Salyzyn
66d51342c8 am 982421df: am 91581f19: Merge "liblog: add pstore write"
* commit '982421df4584f5691b33444ae3e18b81d6544b6a':
  liblog: add pstore write
2015-01-24 16:57:50 +00:00
Mark Salyzyn
cd7ef90e62 am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"
* commit 'f0cc42f525c237431aa560ff42a3e8548bfbd3f4':
  logd: create private/android_logger.h
2015-01-24 16:57:48 +00:00
Mark Salyzyn
982421df45 am 91581f19: Merge "liblog: add pstore write"
* commit '91581f19906ade01eabc6e10a7dac209e710117a':
  liblog: add pstore write
2015-01-23 23:59:45 +00:00
Mark Salyzyn
f0cc42f525 am 4730328d: Merge "logd: create private/android_logger.h"
* commit '4730328da72ef9b7aeaefc120358155fdfd8dde8':
  logd: create private/android_logger.h
2015-01-23 23:59:43 +00:00
Zhijun He
7be3af0a7a Merge "camera: add external camera facing enum" 2015-01-23 23:57:59 +00:00
Mark Salyzyn
d91ab5815d liblog: add pstore write
Used to push the Android log messages into pstore
(when available, and no propagation of error).

Change-Id: I9def8cf796d35d347f502d9745d5f42ec1200253
2015-01-23 23:33:31 +00:00
Mark Salyzyn
b5f6e45d6b logd: create private/android_logger.h
- create a structure to depict the private header
  expected at logd end of socket.
- utilize this new structure instead of unscalable
  byte stream technique used to unpack in logd.

Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de0
2015-01-23 23:32:11 +00:00
Zhijun He
46e0a589d5 camera: add external camera facing enum
This is to enable the external camera support.

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-22 13:43:09 -08:00
Christopher Ferris
bd3bbff674 am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
* commit 'd426a4e7b62c18124827868ddbf8987aa433451b':
  Move 32 bit/64 bit check into debuggerd.
2015-01-22 00:13:01 +00:00
Christopher Ferris
9774df6134 Move 32 bit/64 bit check into debuggerd.
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone
try and directly contact the correct debuggerd (32 bit vs 64 bit)
by reading the elf information for the executable.
Unfortunately, system_server makes a call to dump_backtrace_to_file
and it doesn't have permissions to read the executable data, so it
defaults to always contacting the 64 bit debuggerd.
This CL changes the code so that all dump requests go to the 64 bit
debuggerd, which reads the elf information and redirects requests for
32 bit processes to the 32 bit debuggerd.

Testing:

- Forced the watchdog code in system_server to dump stacks and
  verified that all native stacks are dumped correctly.
- Verified that dumpstate and bugreport still properly dump the native
  processes on a 64 bit and 32 bit system.
- Intentionally forced the 64 bit to 32 bit redirect to write only a
  byte at a time and verified there are no errors, and no dropped data.
- Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes
  seemlessly.
- Used debuggerd on a 32 bit system to dump native stacks.

Bug: https://code.google.com/p/android/issues/detail?id=97024
Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
2015-01-20 17:22:07 -08:00
Elliott Hughes
bb604524fb am 45c4c06f: Merge "Remove unused cruft from libcutils."
* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
  Remove unused cruft from libcutils.
2015-01-16 16:02:24 +00:00
Jeff Sharkey
7c42c7f84f am 9f72ef89: Merge "Extend to receive NFLOG packets."
* commit '9f72ef8944a93bd333c6c7f87c7f7d79207ae663':
  Extend to receive NFLOG packets.
2015-01-16 06:07:29 +00:00
Elliott Hughes
f21717cd87 Remove unused cruft from libcutils.
Change-Id: I316d39e8e0a9aa385d8e1f37678b8bf2c03441eb
2015-01-15 21:16:03 -08:00
Jeff Sharkey
9f72ef8944 Merge "Extend to receive NFLOG packets." 2015-01-16 01:11:02 +00:00
Christopher Ferris
fa41e0f5c8 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581

(cherry picked from commit 5f2ff6a910)

Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
2015-01-15 15:34:21 -08:00
Dmitry Shmidt
2901b30a58 am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
* commit '70f6dea9d06876bc65181c40ee9e623be196fb4c':
  android_filesystem: Remove setuid bits from tcpdump
2015-01-15 20:51:35 +00:00
Jeff Sharkey
9a20e67fa6 Extend to receive NFLOG packets.
Packets captured and logged by the NFLOG target are unicast, so
extend to catch and decode them.  To avoid escaping issues, the raw
contents are passed around as hex strings.

Bug: 18335678
Change-Id: Ib7299500baa00080a1f000f9da843eb527363353
2015-01-15 12:50:59 -08:00
Dmitry Shmidt
70f6dea9d0 Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev 2015-01-15 20:45:06 +00:00
Dmitry Shmidt
33e4f4d81a android_filesystem: Remove setuid bits from tcpdump
Bug: 18669116

Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-01-15 10:35:54 -08:00
Christopher Ferris
844c7ccc0a am 5f2ff6a9: Add timed versions of stack dumping functions.
* commit '5f2ff6a9106083e2a79b8600a0bf6a5341c6ca38':
  Add timed versions of stack dumping functions.
2015-01-15 01:48:27 +00:00
Christopher Ferris
5f2ff6a910 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
2015-01-14 15:24:33 -08:00
Chih-Hung Hsieh
62ea6b268f am ce1928e9: Merge "Add required casts for clang/llvm -Wc++11-narrowing"
* commit 'ce1928e987923a276ff048c69d9a6f43f22610ba':
  Add required casts for clang/llvm -Wc++11-narrowing
2015-01-13 17:51:27 +00:00
Chih-Hung Hsieh
ba8cdf99a4 Add required casts for clang/llvm -Wc++11-narrowing
system/core/include/utils/Mutex.h:134:25: error: non-constant-expression
cannot be narrowed from type 'long long' to '__kernel_time_t' (aka
'long') in initializer list [-Wc++11-narrowing]

system/core/include/utils/Mutex.h:135:26: error: non-constant-expression
cannot be narrowed from type 'long long' to 'long' in initializer list
[-Wc++11-narrowing]

Change-Id: Icb9df26aeb01617da5ab1c36987289f7c2b11954
2015-01-12 16:53:52 -08:00
Elliott Hughes
4d9ddb14c0 am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
* commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
2015-01-12 22:28:11 +00:00
Elliott Hughes
ae52165490 Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
Change-Id: I3d92dbecebd2bb449a8c4332de684919a58847ad
2015-01-12 13:56:34 -08:00
Elliott Hughes
508a1a4df7 am 9da414f9: Merge "Linux always has POSIX clocks available."
* commit '9da414f95e06979e60b48380afbf5372c1ef0ef3':
  Linux always has POSIX clocks available.
2015-01-10 00:42:40 +00:00
Elliott Hughes
76f0a84f6a Linux always has POSIX clocks available.
pixelflinger doesn't have to run on the Mac, but the Condition
code might.

Change-Id: Ib4e9b4daa6e848ffd5742959427b172d45f08e3c
2015-01-09 16:17:46 -08:00
Elliott Hughes
55410c4e62 am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>."
* commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af':
  You either have winsock or <sys/sockets.h>.
2015-01-09 22:02:26 +00:00
Elliott Hughes
3906c8511e You either have winsock or <sys/sockets.h>.
There is no third choice.

Change-Id: I8f1206f22798f747896dd53f3081cdfa4b1707c4
2015-01-09 12:21:51 -08:00
Jesse Hall
ec8e7e2ccb am 7208a015: Merge "Mutex: add timedLock() method"
* commit '7208a01514284becbd32cf4dfd256e4b10448f8e':
  Mutex: add timedLock() method
2015-01-07 18:12:00 +00:00
Jesse Hall
7208a01514 Merge "Mutex: add timedLock() method" 2015-01-07 18:01:11 +00:00
Jesse Hall
601424a84f Mutex: add timedLock() method
This is not available for host builds because OSX doesn't have
pthread_mutex_timedlock() or equivalent.

Bug: 18842510
Change-Id: I072e74ab1a6f770fd245828b39c5f954dda1113b
2015-01-07 08:06:51 -08:00
Mark Salyzyn
aeeaee58a1 am e892279b: Merge "liblog: Add log_time += operator"
* commit 'e892279b3a29060d873bd65e55b3a613e61fe04d':
  liblog: Add log_time += operator
2015-01-05 20:24:57 +00:00
Mark Salyzyn
decd92945f liblog: Add log_time += operator
Change-Id: I1d2987b6cb333fc344d4fee1b7bb25f32a4143c6
2015-01-05 16:27:54 +00:00
Dan Albert
977b84140f am da4f30c5: Merge "Remove incompatible Unicode compatibility types."
* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
  Remove incompatible Unicode compatibility types.
2014-12-12 02:53:25 +00:00
Dan Albert
da4f30c5b4 Merge "Remove incompatible Unicode compatibility types." 2014-12-12 02:42:30 +00:00
Chih-Hung Hsieh
d3653c90cd am 3570072c: Merge "Use full qualified name in macros."
* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
  Use full qualified name in macros.
2014-12-11 19:54:27 +00:00
Chih-Hung Hsieh
c777f213b3 Use full qualified name in macros.
The ANDROID_SINGLETON_STATIC_INSTANCE is used in some files
out of the android namespace. If it does not use full qualified
names, users of this macro will need to use it inside the 'android'
namespace to avoid warnings from clang compiler.

Change-Id: Ie4d4ba2b57fdc72d0deb3b7c2326304a44a1300f
2014-12-11 11:19:57 -08:00
Eric Laurent
4108bccbe8 am 4fca5918: audio: add usage "virtual source" to audio attributes.
* commit '4fca59181c838b91572d1b57cb74b26d0a70528f':
  audio: add usage "virtual source" to audio attributes.
2014-12-10 22:20:09 +00:00
Eric Laurent
4fca59181c audio: add usage "virtual source" to audio attributes.
Bug: 16006090.
Change-Id: I2d22b52e97095b57a6508b82bd11e27f860bb2e7
2014-12-09 12:13:13 -08:00
Eric Laurent
be7bb9004c am 47f52f24: audio: new stream types
* commit '47f52f247d6d895878b831de448f19b98225515d':
  audio: new stream types
2014-11-26 12:01:50 +00:00
Elliott Hughes
bbd3b7edd7 am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
  Only Windows doesn't have <sys/uio.h>.
2014-11-25 21:55:37 +00:00
Elliott Hughes
111e3d3d9c Only Windows doesn't have <sys/uio.h>.
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.

Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
2014-11-25 13:27:43 -08:00
Elliott Hughes
a0959e90f5 am 8eb770d3: Merge "Remove long-dead readtty."
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
  Remove long-dead readtty.
2014-11-25 19:03:12 +00:00
Elliott Hughes
b120134bd1 Remove long-dead readtty.
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
2014-11-24 12:01:21 -08:00
Eric Laurent
47f52f247d audio: new stream types
Added stream types for internal use by audio policy
and audio flinger.

Bug: 18067208.
Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
2014-11-24 10:41:21 -08:00
Elliott Hughes
b741221117 am 456661e3: Merge "Fix Mac build."
* commit '456661e38cefe1afbf640036f710f0d481b64bf9':
  Fix Mac build.
2014-11-22 15:42:41 +00:00
Elliott Hughes
8c275ffcba Fix Mac build.
Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
2014-11-22 07:25:02 -08:00
Elliott Hughes
e79cd67cfd am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
* commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc':
  Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
2014-11-22 08:01:20 +00:00
Elliott Hughes
97ac0e1bb4 Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
2014-11-21 23:10:45 -08:00
Dan Albert
5ef3bcc768 am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."
* commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74':
  Add a pre-C++11 constexpr compatibility macro.
2014-11-20 20:21:55 +00:00
Dan Albert
c59932f937 Remove incompatible Unicode compatibility types.
As well intentioned as these were, uint16_t and C++11's char16_t are
_not_ actually compatible. They are not implicitly convertible, and
they mangle differently, so they are not even ABI compatible. In our
now wonderous world of C++11, no one should be using these, so just
kill them.

Bug: 18300613
Change-Id: I06d92d7f1d937dd94a620874323d4c50eb6a31bd
2014-11-20 11:54:39 -08:00
Dan Albert
e4c649c9fc Add a pre-C++11 constexpr compatibility macro.
Needed for cases where something should be constexpr if possible, but
not being constexpr is fine if in pre-C++11 code (such as a const
static float member variable).

Bug: 18466763
Change-Id: I635d062575ba2fbc4cbe3a89f730128c404d95e1
2014-11-20 10:47:55 -08:00
Elliott Hughes
83ebca0290 am ac252357: Merge "Remove atomic-inline.h."
* commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715':
  Remove atomic-inline.h.
2014-11-17 23:16:44 +00:00
Elliott Hughes
c3914d2be2 Remove atomic-inline.h.
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
2014-11-17 14:38:56 -08:00
Elliott Hughes
ba96de5f65 am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."
* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
  Remove the error-prone TARGET_CPU_SMP from system/core.
2014-11-17 19:40:16 +00:00
Elliott Hughes
e9ca709a73 Remove the error-prone TARGET_CPU_SMP from system/core.
This means that code that uses libcutils no longer has to ensure that
it's set ANDROID_SMP in the calling code's Android.mk for this to
function correctly.

Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
2014-11-17 11:16:59 -08:00
Hans Boehm
0b7f368442 am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""
* commit '64d7117efc7f7b8b477cd216a119b07041d8f406':
  Second attempt to "Rewrite atomic.h to use stdatomic.h."
2014-11-14 00:26:51 +00:00
Hans Boehm
c56648948c Second attempt to "Rewrite atomic.h to use stdatomic.h."
This should not be committed until win_sdk and aarch64 builds are
fixed in the presence of this CL.

This reverts commit 2789faabfa.

We additionally remove uniprocessor support from the earlier CL,
thus avoiding a potential compiler code reordering issue.

Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
2014-11-13 15:59:10 -08:00
Yabin Cui
556f43820f am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"
* commit '2c0839e9dba6d9d282f8391c3edb14236f56618d':
  kill HAVE_POSIX_FILEMAP
2014-11-11 19:53:38 +00:00
Yabin Cui
266092c52d kill HAVE_POSIX_FILEMAP
Bug: 18315579
Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
2014-11-11 10:31:30 -08:00
Nick Kralevich
d6520cf958 am 65a83bdf: Merge "Reserve some AIDs for OEMs"
* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
  Reserve some AIDs for OEMs
2014-11-10 17:51:34 +00:00
Nick Kralevich
65a83bdf2e Merge "Reserve some AIDs for OEMs" 2014-11-10 17:42:58 +00:00
Johan Redestig
60ac6364ec Reserve some AIDs for OEMs
OEMs frequently add some AIDs on their own. Reserve some range
for them to use.

Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
2014-11-10 08:14:21 +01:00
Stephen Hines
96031a9985 am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
  Move winsock2.h in front of a potential windows.h include.
2014-11-09 09:03:31 +00:00
Dan Albert
7c7a782cad am aaa920d7: Merge "Make Unicode.h use types that match libc++."
* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.
2014-11-09 09:03:30 +00:00
Stephen Hines
f02c797256 Merge "Move winsock2.h in front of a potential windows.h include." 2014-11-09 07:24:43 +00:00
Stephen Hines
7e34121e39 Move winsock2.h in front of a potential windows.h include.
Files that included FileMap.h (possibly transitively), before including
ByteOrder.h (which pulls in winsock2.h directly), will experience a
compiler warning/error from the latest mingw headers. This happens because
the headers require that winsock2.h come before windows.h in all cases.
The simplest (and most error-proof) fix for now is to include winsock2.h
before this use of windows.h.

Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
2014-11-08 19:30:05 -08:00
Dan Albert
2f5ad5ff86 Make Unicode.h use types that match libc++.
libc++ also defines these types for pre-C++11, and the two definitions
need to match to avoid redefinition errors.

Bug: 18300613
Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
2014-11-08 20:22:30 +00:00
Calin Juravle
4de4e6defc resolved conflicts for merge of e3c22c41 to stage-aosp-master
Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
2014-10-28 19:09:50 +00:00
Calin Juravle
0f31008eaf Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-dev
automerge: 9c094da

* commit '9c094da83112bbcad37eaffecfee96ff169d84a8':
  Handle code_cache dir creation in libnativebridge
2014-10-28 18:08:02 +00:00
Calin Juravle
1402fbb135 Handle code_cache dir creation in libnativebridge
Also:

- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with

Bug: 18027433
Bug: 18097480

(cherry picked from commit f9d9e2a2d9)

Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
2014-10-27 15:37:32 +00:00
Calin Juravle
f9d9e2a2d9 Handle code_cache dir creation in libnativebridge
Also:

- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with

Bug: 18027433
Bug: 18097480

Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
2014-10-27 15:03:13 +00:00
Chih-Hung Hsieh
6ea35520fd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
c37387a4cd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh
2d3150e736 Do not inline rarely used trace function bodies.
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.

BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
2014-10-14 15:37:20 -07:00
Carson Liao
519d1cf44a am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
* commit '4b0374ae1a97cff279f287dded14619e9579da62':
  modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
2014-10-07 17:06:04 +00:00
Carson Liao
4c4cf467f5 modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
Review: https://partner-android-review.git.corp.google.com/#/c/183993

    Signed-off-by: Carson Liao <carson.liao@mediatek.com>

Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
2014-10-06 22:02:37 -07:00
Hans Boehm
f381920b58 am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:17:43 +00:00
Hans Boehm
054627df6b am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:09:19 +00:00
Hans Boehm
2789faabfa Revert "Rewrite atomic.h to use stdatomic.h."
This reverts commit cb344d4640.

Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
954fc61b6b am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:45 +00:00
Hans Boehm
2ac8207e50 am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:30 +00:00
Hans Boehm
cb344d4640 Rewrite atomic.h to use stdatomic.h.
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.

Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
jgu21
2d83ca4cc1 am b3facbfd: LibNativeBridge: Add early init & env setup
* commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42':
  LibNativeBridge: Add early init & env setup
2014-09-29 03:37:07 +00:00
jgu21
b3facbfdec LibNativeBridge: Add early init & env setup
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().

Turn on -Wall for libnativebridge.

(cherry picked from commit 962eb40abb)
(cherry picked from commit ab0da5a9a6)
(cherry picked from commit 2f71cb24fa)
(cherry picked from commit 04054e28e2)
(cherry picked from commit 4390a63236)

Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
2014-09-26 13:04:36 -07:00
Hochi Huang
54d5b2e670 am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0
* commit 'fcbb23adc939dd27122d962e5f7e7f016259f03e':
  [AU] Update volume setting and Audio Device API 3.0
2014-09-26 00:24:11 +00:00
Hochi Huang
fcbb23adc9 [AU] Update volume setting and Audio Device API 3.0
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7
2014-09-25 21:26:02 +00:00
Andreas Gampe
69974972be resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp 2014-09-24 16:00:12 -07:00
Andreas Gampe
2a0f42b58d resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp 2014-09-24 15:56:29 -07:00
Andreas Gampe
9d1b922725 Merge "LibNativeBridge: Add early init & env setup" 2014-09-24 22:00:06 +00:00
Eric Laurent
4c58d89452 am 62e05407: am f6cce347: audio: add HW hotword capture flag
* commit '62e05407da5c36b6c4057e613ae6d4e3068a3721':
  audio: add HW hotword capture flag
2014-09-24 04:19:16 +00:00
jgu21
ab0da5a9a6 LibNativeBridge: Add early init & env setup
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().

Turn on -Wall for libnativebridge.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-23 20:08:25 -07:00
Eric Laurent
e6b10121ad am f6cce347: audio: add HW hotword capture flag
* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
  audio: add HW hotword capture flag
2014-09-24 02:26:33 +00:00
Elliott Hughes
ed561793f3 am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:52 +00:00
Elliott Hughes
830b77bc5c am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:18 +00:00