Commit Graph

51673 Commits

Author SHA1 Message Date
Elliott Hughes
8d9f899a5e am 031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"
* commit '031fec0b9da7f5985c5a1650ed570ca3872e63c0':
  ServiceManager: Print kernel/userspace binder version
2015-04-04 00:13:25 +00:00
Elliott Hughes
031fec0b9d Merge "ServiceManager: Print kernel/userspace binder version" 2015-04-04 00:03:46 +00:00
Serban Constantinescu
018cf41a15 ServiceManager: Print kernel/userspace binder version
This patch adds extra logging for the binder version in case the userspace
and kernel versions differ.

Change-Id: I9859b29099726cfcfe5ca23d88ed2e101a06af1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2015-04-03 17:02:48 -07:00
Dan Stoza
03af2bf6c3 am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"
* commit '1e954441d22d0feb28caceee9fe14bc7729b7b90':
  DO NOT MERGE libgui: Plumb attach/detach through Surface
2015-04-03 16:19:55 +00:00
Dan Stoza
1e954441d2 Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface" 2015-04-03 16:10:13 +00:00
Fyodor Kupolov
ebca76c232 am 9cad1985: Merge "Fix errors caused by unused variables"
* commit '9cad1985880f700be3150f05ca3539444da850d2':
  Fix errors caused by unused variables
2015-04-03 00:16:38 +00:00
Fyodor Kupolov
9cad198588 Merge "Fix errors caused by unused variables" 2015-04-03 00:05:33 +00:00
Fyodor Kupolov
26ff93c1a7 Fix errors caused by unused variables
Change-Id: Ie52ae0e9a642504ee7b78c6bc54b61549cfb0342
2015-04-02 17:03:11 -07:00
Fyodor Kupolov
63750cb696 am 4eb88f88: Merge "Support for storing OAT files in app directory"
* commit '4eb88f883911eb1208e85a9c176481176242af13':
  Support for storing OAT files in app directory
2015-04-02 23:20:59 +00:00
Fyodor Kupolov
4eb88f8839 Merge "Support for storing OAT files in app directory" 2015-04-02 23:11:01 +00:00
Dan Stoza
231832eb27 DO NOT MERGE libgui: Plumb attach/detach through Surface
Exposes the attachBuffer and detachNextBuffer calls from
IGraphicBufferProducer to the public Surface interface. Also moves
the version of connect that takes a producer callback from protected
to public.

Bug: 19628705
Change-Id: I9ebc3013c4d9c84c4e8ef150c00e03f8af80319e
(cherry picked from commit c14ecb9de2)
2015-04-02 13:35:45 -07:00
Mark Salyzyn
0f9bf17ad6 am 23b204e1: Merge "servicemanager: service_manager missing include for string.h"
* commit '23b204e1ee9069b9321b5547e8d17a5014efbacd':
  servicemanager: service_manager missing include for string.h
2015-04-01 19:38:00 +00:00
Mark Salyzyn
23b204e1ee Merge "servicemanager: service_manager missing include for string.h" 2015-04-01 19:26:23 +00:00
Dan Stoza
940414b634 am ef62116d: (-s ours) Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"
* commit 'ef62116d802237ebac77465d6ff6779ecfe038ae':
  DO NOT MERGE libgui: Remove IGBC::BufferItem
2015-04-01 18:48:14 +00:00
Dan Stoza
ef62116d80 Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem" 2015-04-01 18:41:24 +00:00
Mark Salyzyn
13df5f5f8f servicemanager: service_manager missing include for string.h
service_manager.c gets string.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for string.h in this
include file.

Bug: 19908228
Change-Id: Icc95ee02bf02c596463868b1330d209d1bd5c58a
2015-04-01 11:11:11 -07:00
Andreas Gampe
8c60cec0cf am 5881c8dd: Merge "Installd: Support dex2oat threads system property"
* commit '5881c8dd3b5b290cddca0e0f01e2c2f1641826b0':
  Installd: Support dex2oat threads system property
2015-03-31 03:24:59 +00:00
Andreas Gampe
5881c8dd3b Merge "Installd: Support dex2oat threads system property" 2015-03-31 03:20:16 +00:00
Andreas Gampe
8d7af8b241 Installd: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in installd and pass to dex2oat.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
2015-03-30 18:45:03 -07:00
Fyodor Kupolov
88ce4ff7a9 Support for storing OAT files in app directory
Changes to installd:
- dexopt now allows oat_dir param for custom output directory
- Added helper method calculate_oat_file_path for calculating oat file
  output location based on oat_dir and apk_path.

Bug: 19550105
Change-Id: I6b079207310583adeb6dad918a58034a059e34c4
2015-03-30 13:48:22 -07:00
John Reck
88c52865f3 am 0faebfb2: Merge "Add trace_event_clock_sync to atrace"
* commit '0faebfb2f5a07939e7264a94fdcebecc4df39873':
  Add trace_event_clock_sync to atrace
2015-03-27 00:21:41 +00:00
John Reck
0faebfb2f5 Merge "Add trace_event_clock_sync to atrace" 2015-03-27 00:13:32 +00:00
John Reck
469a194051 Add trace_event_clock_sync to atrace
Change-Id: I8adce15210d82df09ff3a39ddd8df617aeb16a42
2015-03-26 16:57:30 -07:00
Richard Uhler
b84a3dde35 am bc5aceb1: Merge "Store odex files in oat/<isa>/ directory."
* commit 'bc5aceb1f0a68e96dced1d843278b3bf14504f2c':
  Store odex files in oat/<isa>/ directory.
2015-03-26 15:04:46 +00:00
Richard Uhler
bc5aceb1f0 Merge "Store odex files in oat/<isa>/ directory." 2015-03-26 14:57:36 +00:00
Richard Uhler
009b877132 Store odex files in oat/<isa>/ directory.
Previously odex files were stored alongside the dex location as:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/<isa>/base.odex

This changes where odex files are stored, adding an "oat" directory:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/oat/<isa>/base.odex

See also the corresponding changes in platform/art and platform/build.

Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
2015-03-25 11:11:05 -07:00
Jesse Hall
c2a5b469a3 am a527c07b: Merge "Fix mistake using width instead of height."
* commit 'a527c07b8d078f7da1114b7055f65b479a148729':
  Fix mistake using width instead of height.
2015-03-24 20:59:51 +00:00
Jesse Hall
a527c07b8d Merge "Fix mistake using width instead of height." 2015-03-24 20:52:52 +00:00
Christopher Ferris
0e7497957a Fix mistake using width instead of height.
Found by rodrigo.chiossi@intel.com.

Change-Id: I49d590ed39f6b47ba58a77a75d66b2964ea1cb1d
2015-03-23 14:37:26 -07:00
Mathieu Chartier
b4cf4d7d94 am 6dad1713: Merge "Use verify-at-runtime if debug.usejit is true"
* commit '6dad1713040a46ec6e2ca1b0df2cbe4240e9e2e9':
  Use verify-at-runtime if debug.usejit is true
2015-03-21 15:29:35 +00:00
Mathieu Chartier
6dad171304 Merge "Use verify-at-runtime if debug.usejit is true" 2015-03-21 00:14:27 +00:00
Mathieu Chartier
d4a7b459f4 Use verify-at-runtime if debug.usejit is true
Bug: 19735273
Change-Id: Ib65b50dbde00184544a1341f351a0fe0ef504d32
2015-03-20 16:05:18 -07:00
Dan Stoza
1c87e474d8 DO NOT MERGE libgui: Remove IGBC::BufferItem
Removes IGraphicBufferConsumer::BufferItem. Depends on the
following changes:
    I187b3a7d05196b6289596afac8fb9a9d4aebff76
    I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc

Cherry-pick of Id1fa56d092188f2cb712768d5d2fc6a9027fb73c

Change-Id: I3edf0db8fba656fd78e18a5a7f1137f0fb6b237d
2015-03-20 12:29:04 -07:00
Dan Stoza
237079112d am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem"
* commit '701473cf9bb1d1da2a0f55d9732d3016e1f33d59':
  DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
2015-03-20 19:09:07 +00:00
Dan Stoza
701473cf9b Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem" 2015-03-20 18:56:05 +00:00
Dan Stoza
355d81184e am 7d89f5b6: (-s ours) Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal"
* commit '7d89f5b6562da8bb316f04f91dd7cc9fce33d7fd':
  DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
2015-03-20 18:54:28 +00:00
Dan Stoza
7d89f5b656 Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal" 2015-03-20 18:47:47 +00:00
Dan Stoza
1ca558f798 am f44d13e7: (-s ours) Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."
* commit 'f44d13e7e574f181750fa37f439ab50cf05ab3df':
  DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
2015-03-20 18:40:55 +00:00
Dan Stoza
f44d13e7e5 Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums." 2015-03-20 18:36:19 +00:00
Dan Stoza
11611f9be5 DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
Switches all uses of IGraphicBufferConsumer::BufferItem (and
BufferQueue::BufferItem) to the BufferItem in libgui. Depends on
frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9.

Cherry pick of I187b3a7d05196b6289596afac8fb9a9d4aebff76

Change-Id: I5bc79fb96b6cba6021af64b20890967aa3b7fcbf
2015-03-19 13:59:12 -07:00
Dan Stoza
cf3834db10 DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
Currently, there are two instances of BufferItem: one inside of
IGraphicBufferConsumer, and a standalone one inside of libgui. They
only differ in the name of one of the fields, and we want to remove
the IGBC version. This changes things so that client code may be
incrementally switched over to the libgui version.

This is a squashed commit containing the following changes:
    I64f495105f56cbf5803cea4aa6b072ea29b70cf5
    I1394e693314429ada93427889f10b7b01c948053
    I9c3bc8037fa9438d4d9080b8afb694219ef2f71f
    I699ed0a6837076867ca756b28d1ffb2238f7a0d9
    Iac8425e1241774304a131da2fb9dec6e82922f13

Change-Id: Ic4d51f5df6dbc70b376d13fceba2335b9bae4f3d
2015-03-19 13:58:07 -07:00
Eino-Ville Talvala
82c6bcc970 DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
- Wire up new dataSpace parameter through buffer queue stack
- Update tests to include the parameter
- Switch eglApi to using dataSpace to indicate sRGB gamma/linear
  difference
- Remove RAW_SENSOR in favor of RAW16
- Remove use of sRGB format enums
- Add default dataspace to buffer queue core
- Add query for default dataspace

Cherry pick of I070bd2e7c56506055c419004c29e2e3feac725df

Change-Id: I461952389c18051176c6b75e664f20ad369f5760
2015-03-19 13:56:00 -07:00
Nick Kralevich
f320149886 Merge "dumpstate: add O_CLOEXEC" 2015-03-19 18:48:08 +00:00
Nick Kralevich
cd67e9f059 dumpstate: add O_CLOEXEC
Add O_CLOEXEC to various file descriptor calls, to avoid
leaking file descriptors to dumpstate's child processes.

Bug: 18342188
Change-Id: I74c47a98dfddc29c618067ad53d879b98ed1d87a
2015-03-19 11:32:02 -07:00
Dan Stoza
ad36432de8 Merge "Surface: Permit an IProducerListener on connect" 2015-03-19 17:45:26 +00:00
Dan Stoza
c193063050 Merge "libgui: Only allow one return from useFenceSync" 2015-03-19 17:35:57 +00:00
Dan Stoza
744fc02fe8 libgui: Only allow one return from useFenceSync
An #ifdef was causing multiple returns in this function, which was
triggering an unreachable code error on some build targets. This
adds an #else to ensure that only one return is exposed in any given
build.

Cherry pick of I9ed7c3e769bc9094ad31d810944227d1d8302886

Change-Id: Ibddc5706159d168031d1805fcce3eedc068296cf
2015-03-19 10:32:51 -07:00
Dan Stoza
55466b4850 Merge "GLConsumer: Fix unsigned subtraction during crop" 2015-03-19 17:22:23 +00:00
Dan Stoza
f87d1bcd65 Merge "Update maxNumber to be smaller." 2015-03-19 17:16:15 +00:00
Dan Stoza
3d5efd553e Merge "libgui: Enable -Weverything and -Werror" 2015-03-19 17:06:40 +00:00