Commit Graph

52360 Commits

Author SHA1 Message Date
Fyodor Kupolov
b3fb52f7d8 am bce77997: am ebca76c2: am 9cad1985: Merge "Fix errors caused by unused variables"
* commit 'bce7799786ae712bba9b58f1f99cd12ee05b5cf3':
  Fix errors caused by unused variables
2015-04-03 14:52:38 +00:00
Fyodor Kupolov
35eefd2fa7 am a46d5e4b: am 63750cb6: am 4eb88f88: Merge "Support for storing OAT files in app directory"
* commit 'a46d5e4b9a598330e2a79395dbd201ab88aded00':
  Support for storing OAT files in app directory
2015-04-03 14:52:20 +00:00
Andreas Gampe
3632ec5c44 am 40da142b: am 2cc42f0b: (-s ours) Installd: Support dex2oat threads system property
* commit '40da142bbfd3ff9234e5a51b4c0e8dbbb7617d81':
  Installd: Support dex2oat threads system property
2015-04-03 14:51:58 +00:00
Fyodor Kupolov
bce7799786 am ebca76c2: am 9cad1985: Merge "Fix errors caused by unused variables"
* commit 'ebca76c23215579a23dde144d1950037d52452bf':
  Fix errors caused by unused variables
2015-04-03 00:26:42 +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
a46d5e4b9a am 63750cb6: am 4eb88f88: Merge "Support for storing OAT files in app directory"
* commit '63750cb6969c5cf70df5d9bfc571ee107456ed5a':
  Support for storing OAT files in app directory
2015-04-02 23:27:40 +00: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
Andreas Gampe
40da142bbf am 2cc42f0b: (-s ours) Installd: Support dex2oat threads system property
* commit '2cc42f0bb3db6ff63fec4cbc282fa8af33d82fca':
  Installd: Support dex2oat threads system property
2015-04-02 23:11:45 +00:00
Fyodor Kupolov
4eb88f8839 Merge "Support for storing OAT files in app directory" 2015-04-02 23:11:01 +00:00
Dan Stoza
c1487b1a60 Merge "Revert "libgui: Plumb attach/detach through CpuConsumer"" 2015-04-02 22:37:04 +00:00
Dan Stoza
921d1d7a61 Revert "libgui: Plumb attach/detach through CpuConsumer"
This reverts commit 20c5672883.
2015-04-02 13:48:15 -07: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
Nick Kralevich
888bb7184d Merge "Parcel.cpp: reject size_t arguments greater than INT32_MAX" 2015-04-02 18:27:03 +00:00
Nick Kralevich
b6b1423c87 Parcel.cpp: reject size_t arguments greater than INT32_MAX
It's a security best practice for size_t values to be rejected if
they are greater than INT32_SIZE. This is intended to prevent the
common error of inadvertently passing a negative int value to a
function, which after conversion to an unsigned type, becomes a huge
number, defeating the purpose of bounds checking.

This patch also addresses a bug where the call to:
  Parcel::write(buf, (size_t) -1);
would call writeInPlace() which uses PAD_SIZE on the supplied
argument. This would then cause an integer overflow, with PAD_SIZE
returning a small value, but the memcpy in Parcel::write using the
old large length value.

Bug: 19573085
Change-Id: Ib11bfb3dae4f3be91cd17b2c676926700972c7b8
2015-04-02 10:56:12 -07:00
Etan Cohen
eb5782cdb2 Merge "Merge commit '63e8376d0baf494f9dd7e866d8dedb26ffab2a6b' into merge" 2015-04-02 03:10:53 +00:00
Mark Salyzyn
f386c961ea am a231a128: am 0f9bf17a: am 23b204e1: Merge "servicemanager: service_manager missing include for string.h"
* commit 'a231a1287815e80a5ab11e30254005b81254d891':
  servicemanager: service_manager missing include for string.h
2015-04-01 22:09:31 +00:00
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