Mark Salyzyn
a231a12878
am 0f9bf17a
: am 23b204e1
: Merge "servicemanager: service_manager missing include for string.h"
...
* commit '0f9bf17ad6caf7cec9043b1330cd3387b8881c0f':
servicemanager: service_manager missing include for string.h
2015-04-01 19:48:52 +00: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
Dan Stoza
4178a6750c
am dfca41d3
: (-s ours) am 940414b6
: (-s ours) am ef62116d
: (-s ours) Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"
...
* commit 'dfca41d3a89e2c6e61c6749b5f5af670bdf90891':
DO NOT MERGE libgui: Remove IGBC::BufferItem
2015-04-01 19:28:13 +00:00
Mark Salyzyn
23b204e1ee
Merge "servicemanager: service_manager missing include for string.h"
2015-04-01 19:26:23 +00:00
Dan Stoza
dfca41d3a8
am 940414b6
: (-s ours) am ef62116d
: (-s ours) Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"
...
* commit '940414b6345f02e6a7e7695ab4fe31810b2c49ef':
DO NOT MERGE libgui: Remove IGBC::BufferItem
2015-04-01 18:58:38 +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
Marco Nelissen
b1b2193680
Merge "Add backwards compatible versions of IInterface::asBinder()"
2015-03-31 22:10:48 +00:00
Marco Nelissen
5c6ec52ff8
Add backwards compatible versions of IInterface::asBinder()
...
This makes apps linked against the previous non-static versions
work with the new libbinder.
Bug: 19060033
Bug: 19773812
Change-Id: I3b5c78cbb4f4c0681ca1042e4d8503d98f969502
2015-03-31 20:32:30 +00:00
Tim Kilbourn
943f0a45d0
Merge "Stub implementations of HAL usage callbacks."
2015-03-31 20:22:44 +00:00
Etan Cohen
28c2b3e950
Merge commit '63e8376d0baf494f9dd7e866d8dedb26ffab2a6b' into merge
2015-03-31 09:21:07 -07:00
Andreas Gampe
2cc42f0bb3
Installd: Support dex2oat threads system property
...
Check dalvik.vm.dex2oat-threads in installd and pass to dex2oat.
Bug: 19992386
(cherry picked from commit 8d7af8b241
)
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
2015-03-30 21:08:58 -07:00
Andreas Gampe
a053c841df
am 059e9c02
: am 8c60cec0
: am 5881c8dd
: Merge "Installd: Support dex2oat threads system property"
...
* commit '059e9c023eb025472db6775f9c2a95191dd6c2bf':
Installd: Support dex2oat threads system property
2015-03-31 03:43:53 +00:00
Andreas Gampe
059e9c023e
am 8c60cec0
: am 5881c8dd
: Merge "Installd: Support dex2oat threads system property"
...
* commit '8c60cec0cf9356842b7d24c33b1d056e0785626b':
Installd: Support dex2oat threads system property
2015-03-31 03:31:30 +00: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
Mike Lockwood
0fd44a7b3d
Add Package Manager feature to enable MIDI support
...
Change-Id: Ia3cc277af24fcb5117a8d119326de0c8e12bbc09
2015-03-27 13:21:56 -07:00
Tim Kilbourn
62535f0936
Merge "Use EPOLLWAKEUP properly."
2015-03-27 16:24:15 +00:00
John Reck
c1c024a50c
am 3e785e2e
: am 88c52865
: am 0faebfb2
: Merge "Add trace_event_clock_sync to atrace"
...
* commit '3e785e2ef93b068630d0ffb5178a5f38cc249a3d':
Add trace_event_clock_sync to atrace
2015-03-27 00:43:31 +00:00
John Reck
3e785e2ef9
am 88c52865
: am 0faebfb2
: Merge "Add trace_event_clock_sync to atrace"
...
* commit '88c52865f37d9b45c2610b4078bc73f392864572':
Add trace_event_clock_sync to atrace
2015-03-27 00:28:25 +00: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
Aravind Akella
7844220f65
Build error SensorManager.
...
Remove forward declaration for String8 and inlcude the corresponding header file.
Change-Id: I89a4ea42295dc9bb6db2c304ff725cc1d498cd55
2015-03-26 16:06:06 -07:00
Aravind Akella
d46181da0c
Merge "Support restricted mode in SensorService."
2015-03-26 22:17:34 +00:00
Tim Kilbourn
3447df165f
Use EPOLLWAKEUP properly.
...
We were trying to use it only when it wasn't supported.
Bug: 19937342
Change-Id: Id35aef9ad84f101f7ada2eb87fb91e5c5e2b3357
2015-03-26 14:12:42 -07:00
Richard Uhler
59d996fb0d
am da08fc67
: am b84a3dde
: am bc5aceb1
: Merge "Store odex files in oat/<isa>/ directory."
...
* commit 'da08fc672ff9643ada87a38fb98c7bd604b678ad':
Store odex files in oat/<isa>/ directory.
2015-03-26 16:28:29 +00:00
Richard Uhler
da08fc672f
am b84a3dde
: am bc5aceb1
: Merge "Store odex files in oat/<isa>/ directory."
...
* commit 'b84a3dde3583c7c8696679ffaad25c334e85e3cb':
Store odex files in oat/<isa>/ directory.
2015-03-26 15:11:28 +00: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
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