Dan Stoza
955c897482
libgui: Remove IGBC::BufferItem
...
Removes IGraphicBufferConsumer::BufferItem. Depends on the
following changes:
I187b3a7d05196b6289596afac8fb9a9d4aebff76
I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc
Change-Id: I3edf0db8fba656fd78e18a5a7f1137f0fb6b237d
(cherry picked from commit 1c87e474d8
)
2015-04-07 13:49:25 -07:00
Fyodor Kupolov
7897031f3e
am b58e6cbf
: am 4914f85f
: am 8f43f77d
: Merge "Use AID_SYSTEM as uid when creating oat dir"
...
* commit 'b58e6cbfa726add05bbe5e31e8ca13815ccf2049':
Use AID_SYSTEM as uid when creating oat dir
2015-04-07 20:49:09 +00:00
Fyodor Kupolov
b58e6cbfa7
am 4914f85f
: am 8f43f77d
: Merge "Use AID_SYSTEM as uid when creating oat dir"
...
* commit '4914f85f8073073194da5a88c557220456777eda':
Use AID_SYSTEM as uid when creating oat dir
2015-04-07 20:27:49 +00:00
Fyodor Kupolov
4914f85f80
am 8f43f77d
: Merge "Use AID_SYSTEM as uid when creating oat dir"
...
* commit '8f43f77de89df935e7dc2fdeddee132580bb5705':
Use AID_SYSTEM as uid when creating oat dir
2015-04-07 20:18:23 +00:00
Fyodor Kupolov
8f43f77de8
Merge "Use AID_SYSTEM as uid when creating oat dir"
2015-04-07 20:09:43 +00:00
Ronghua Wu
a39c205f87
openmax: add OMX_IndexConfigOperatingRate.
...
Bug: 19620911
Change-Id: I4458705414ab0087bbfd60dee201973045cd711b
2015-04-07 12:25:30 -07:00
Dan Stoza
c9a737b526
am 11da530a
: (-s ours) Merge "Cherry-pick dataSpace and BufferItem changes" into lmp-mr1-dev-plus-aosp
...
* commit '11da530a704fc9406d6779c5b985d3394c6a8474':
Cherry-pick dataSpace and BufferItem changes
2015-04-07 18:50:47 +00:00
Fyodor Kupolov
8eed7e6a9b
Use AID_SYSTEM as uid when creating oat dir
...
Previously AID_INSTALL was used, which was causing permission denied errors
when PackageManager was trying to recursively rename staging directory
Bug: 19550105
Bug: 20087446
Change-Id: I3a9e3056c1fbc1ce0077a3ce52cf77ea6b5085ee
2015-04-07 11:22:00 -07:00
Dan Stoza
11da530a70
Merge "Cherry-pick dataSpace and BufferItem changes" into lmp-mr1-dev-plus-aosp
2015-04-07 18:14:50 +00:00
Eino-Ville Talvala
1c2001efcf
Cherry-pick dataSpace and BufferItem changes
...
Add dataSpace to buffer queues; remove old format enums.
(cherry picked from commit 82c6bcc970
)
libgui: Prepare for IGBC::BufferItem removal
(cherry picked from commit cf3834db10
)
SurfaceFlinger: Stop using IGBC::BufferItem
(cherry picked from commit 11611f9be5
)
Change-Id: Ic2e4770b916d2d1477e5ce98c4b49a0072ea03ff
(cherry picked from commit 6c45010175
)
2015-04-07 11:11:43 -07:00
Jeff Sharkey
c0bae30131
Merge "Valid APK paths now include expanded storage."
2015-04-07 04:24:27 +00:00
Jeff Brown
969baf52d9
Merge "Add support for int64, float, double types to service command."
2015-04-07 03:50:29 +00:00
Erik Kline
1a4b21e039
multinetwork API: native header
...
Bug: 19537384
Change-Id: I7bb2f4310755e0c2ea2f32288000e54d671aebbe
2015-04-07 12:18:25 +09:00
Jeff Brown
d46898fed0
Add support for int64, float, double types to service command.
...
Comes in handy for invoking transactions that require these types.
Change-Id: I8f14519a2531ab2ec7f3218ecda6d1868f6dd7b3
2015-04-06 19:42:43 -07:00
Jeff Sharkey
7d78005a27
Valid APK paths now include expanded storage.
...
Apps on expanded storage live at /mnt/expand/<uuid>/app/com.example,
so we need to relax one more directory level.
Bug: 19993667
Change-Id: I347ec7b92435ea69e632ed5d5fdfabe38ce0b56e
2015-04-06 17:44:27 -07:00
Elliott Hughes
62b58afc21
am 7b5f82d8
: am 46072d58
: am a60ff367
: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
...
* commit '7b5f82d8d726e4bcd21c19340c0743a728bc0253':
Remove useless 'svcmgr_handle' (which had wrong type).
2015-04-06 23:53:49 +00:00
Elliott Hughes
7b5f82d8d7
am 46072d58
: am a60ff367
: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
...
* commit '46072d5834aaef51922667972f02241a220333b8':
Remove useless 'svcmgr_handle' (which had wrong type).
2015-04-06 23:30:25 +00:00
Eino-Ville Talvala
32f0b5b804
am 40191799
: (-s ours) am 6c450101
: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
...
* commit '4019179991bae66f72bae8e81c0f2399da4ee85e':
DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
2015-04-06 23:28:16 +00:00
Elliott Hughes
46072d5834
am a60ff367
: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
...
* commit 'a60ff367a4f55ea319625cf500687c5025604f40':
Remove useless 'svcmgr_handle' (which had wrong type).
2015-04-06 23:19:41 +00:00
Elliott Hughes
a60ff367a4
Merge "Remove useless 'svcmgr_handle' (which had wrong type)."
2015-04-06 23:13:32 +00:00
Eino-Ville Talvala
4019179991
am 6c450101
: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
...
* commit '6c450101753d0219b151e79007bcded1bfbb058b':
DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
2015-04-06 21:15:33 +00:00
Eino-Ville Talvala
6c45010175
DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
...
DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
(cherry picked from commit 82c6bcc970
)
DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
(cherry picked from commit cf3834db10
)
DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
(cherry picked from commit 11611f9be5
)
2015-04-06 11:24:29 -07:00
Elliott Hughes
0b41ad5d6e
Remove useless 'svcmgr_handle' (which had wrong type).
...
Also use the 'ptr' union member rather than 'handle'.
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Change-Id: I68e5336cd3af3bc61dbddd2b33d7e1512c0c329c
2015-04-03 22:46:56 -07:00
Elliott Hughes
177861d98f
am 2d4cf62a
: am 8d9f899a
: am 031fec0b
: Merge "ServiceManager: Print kernel/userspace binder version"
...
* commit '2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9':
ServiceManager: Print kernel/userspace binder version
2015-04-04 00:39:46 +00:00
Elliott Hughes
2d4cf62a2c
am 8d9f899a
: am 031fec0b
: Merge "ServiceManager: Print kernel/userspace binder version"
...
* commit '8d9f899a5e69a652c59d48c70a9c7b0e8100be87':
ServiceManager: Print kernel/userspace binder version
2015-04-04 00:19:19 +00:00
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
5bbd68d644
am 6941090e
: (-s ours) am 03af2bf6
: (-s ours) am 1e954441
: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"
...
* commit '6941090eb6eb14d3bd141f72a4af215162094ec0':
DO NOT MERGE libgui: Plumb attach/detach through Surface
2015-04-03 17:07:39 +00:00
Dan Stoza
6941090eb6
am 03af2bf6
: (-s ours) am 1e954441
: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"
...
* commit '03af2bf6c3a8c81836b572098c3e0be3dc7fc778':
DO NOT MERGE libgui: Plumb attach/detach through Surface
2015-04-03 16:29:54 +00: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
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