Commit Graph

52360 Commits

Author SHA1 Message Date
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
Aravind Akella
4949c50372 Support restricted mode in SensorService.
In restricted mode, only CTS tests can register for sensors or call flush() on them. The requests
from other applications will be ignored.

Change-Id: Ieb923df3e0cfe3390fe2d052af776da79589744b
2015-03-24 15:41:35 -07:00
Jesse Hall
5b20fd0882 am 28c03cca: am c2a5b469: am a527c07b: Merge "Fix mistake using width instead of height."
* commit '28c03cca9835957f6e304b18358243b184fa46f8':
  Fix mistake using width instead of height.
2015-03-24 21:20:24 +00:00
Jesse Hall
28c03cca98 am c2a5b469: am a527c07b: Merge "Fix mistake using width instead of height."
* commit 'c2a5b469a311891d8e3025aea0e4b348044dfaeb':
  Fix mistake using width instead of height.
2015-03-24 21:06:56 +00: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
Ronghua Wu
f556fb1861 Merge "binder: add uint64 support to Parcel." 2015-03-24 16:42:54 +00:00
Eino-Ville Talvala
63e8376d0b 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

Change-Id: I070bd2e7c56506055c419004c29e2e3feac725df
2015-03-23 20:00:29 -07:00
Dan Stoza
28dbde32c2 Surface: Permit an IProducerListener on connect
This change allows clients of Surface to provide an IProducerListener
callback object to Surface::connect, which will be passed down to the
underlying IGraphicBufferProducer

Change-Id: I5ea5229bf3a329bf02c6bd20e7247039c75d136b
2015-03-23 19:59:56 -07:00
Jeff Tinker
dd90a047f0 Merge "Report key request message type for unprefixed EME" 2015-03-24 00:05:39 +00:00
Mathieu Chartier
ab62d4a4a7 am a290b4b9: am b4cf4d7d: am 6dad1713: Merge "Use verify-at-runtime if debug.usejit is true"
* commit 'a290b4b9121dab04c2989ab88017b8286075914b':
  Use verify-at-runtime if debug.usejit is true
2015-03-23 23:24:13 +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
Dan Stoza
d3260abf78 am da3b1e7f: (-s ours) am 23707911: (-s ours) am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem"
* commit 'da3b1e7ff20559ba368a22421c15ffe2cc079386':
  DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
2015-03-22 00:40:38 +00:00
Dan Stoza
d5a4dcc2fc am c6fdc017: (-s ours) am 355d8118: (-s ours) am 7d89f5b6: (-s ours) Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal"
* commit 'c6fdc017fe9ea00dfd3817978c169f64b78e6e95':
  DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
2015-03-22 00:40:37 +00:00
Dan Stoza
6b1066e4d0 am c795dc00: (-s ours) am 1ca558f7: (-s ours) am f44d13e7: (-s ours) Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."
* commit 'c795dc007f779103a8fae707e135827d185d943b':
  DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
2015-03-22 00:40:36 +00:00
Mathieu Chartier
a290b4b912 am b4cf4d7d: am 6dad1713: Merge "Use verify-at-runtime if debug.usejit is true"
* commit 'b4cf4d7d94c54a9fc49329aa891144f87f53602e':
  Use verify-at-runtime if debug.usejit is true
2015-03-21 17:07:45 +00: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
da3b1e7ff2 am 23707911: (-s ours) am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem"
* commit '237079112d245f8415970bd219cb174dae21ac3b':
  DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
2015-03-20 19:13:33 +00:00
Dan Stoza
c6fdc017fe am 355d8118: (-s ours) am 7d89f5b6: (-s ours) Merge "DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal"
* commit '355d81184ea6b423e6fa514797e3529b9062c9cd':
  DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
2015-03-20 19:09:47 +00: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
c795dc007f am 1ca558f7: (-s ours) am f44d13e7: (-s ours) Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."
* commit '1ca558f79861f3c652b5b0726532518aa7c92ef1':
  DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
2015-03-20 18:51:22 +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
Ronghua Wu
2d13afdfa1 binder: add uint64 support to Parcel.
Bug: 19620911
Change-Id: Ifce5319e4e35afd344dead67ab7ba1cd399476a3
2015-03-19 16:45:04 -07: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
4796bc3b27 am 4b9d0b9b: am f3201498: Merge "dumpstate: add O_CLOEXEC"
* commit '4b9d0b9b676afec086bf579015b2f74623b357fd':
  dumpstate: add O_CLOEXEC
2015-03-19 19:11:11 +00:00
Nick Kralevich
4b9d0b9b67 am f3201498: Merge "dumpstate: add O_CLOEXEC"
* commit 'f320149886ba8ab8849c8b8f3df256e3789f3905':
  dumpstate: add O_CLOEXEC
2015-03-19 19:02:53 +00: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
1a309eba79 libgui: Fix bad merge in Surface.h
Fixes a bad merge from AOSP.

Change-Id: Idb69b34787e8f4e76fb64130573168e5fde6a87c
2015-03-19 11:26:45 -07:00
Dan Stoza
be4ccdcdd5 am 663eaf42: am ad36432d: Merge "Surface: Permit an IProducerListener on connect"
* commit '663eaf422d325768808b416d66ecd4648bb14799':
  Surface: Permit an IProducerListener on connect
2015-03-19 18:04:45 +00:00
Dan Stoza
663eaf422d am ad36432d: Merge "Surface: Permit an IProducerListener on connect"
* commit 'ad36432de81c4c88d726680b7c52e8357df98455':
  Surface: Permit an IProducerListener on connect
2015-03-19 17:56:44 +00:00
Dan Stoza
4927d3a492 am 42f0ce10: am c1930630: Merge "libgui: Only allow one return from useFenceSync"
* commit '42f0ce10757e9a1dbf9c997fd0db0eee93c15984':
  libgui: Only allow one return from useFenceSync
2015-03-19 17:54:00 +00:00
Dan Stoza
42f0ce1075 am c1930630: Merge "libgui: Only allow one return from useFenceSync"
* commit 'c193063050e6be193838527fb8bc7a4588bfdc22':
  libgui: Only allow one return from useFenceSync
2015-03-19 17:49:34 +00:00
Dan Stoza
ad36432de8 Merge "Surface: Permit an IProducerListener on connect" 2015-03-19 17:45:26 +00:00
Dan Stoza
c20729bfc9 am 5bebe7e1: am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"
* commit '5bebe7e14d645b02602f0d8a1e19db2f8ebec35d':
  GLConsumer: Fix unsigned subtraction during crop
2015-03-19 17:43:55 +00:00
Dan Stoza
5bebe7e14d am 55466b48: Merge "GLConsumer: Fix unsigned subtraction during crop"
* commit '55466b48504f9a904c54f3cae4fc1a43dec73a6c':
  GLConsumer: Fix unsigned subtraction during crop
2015-03-19 17:36:49 +00:00
Dan Stoza
4b02a79066 am e31591ba: am f87d1bcd: Merge "Update maxNumber to be smaller."
* commit 'e31591baf0a9d9e269e388fdc707057b11009c95':
  Update maxNumber to be smaller.
2015-03-19 17:36:09 +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
417b93ae38 am 7ab0d37d: (-s ours) am 3d5efd55: Merge "libgui: Enable -Weverything and -Werror"
* commit '7ab0d37dbfd9a8777e7c67043c523c6419ed170b':
  libgui: Enable -Weverything and -Werror
2015-03-19 17:32:15 +00:00