Commit Graph

51748 Commits

Author SHA1 Message Date
Dan Stoza
172ff24ccb am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"
* commit '5977851b80549f24cd9164ec075b79c6c6291fa5':
  libgui: Plumb detachBuffer through ConsumerBase
2015-04-07 22:58:47 +00:00
Dan Stoza
5977851b80 am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"
* commit '00afb8177fdbf144c75c00e9eacc915589807d35':
  libgui: Plumb detachBuffer through ConsumerBase
2015-04-07 22:47:50 +00:00
Dan Stoza
00afb8177f Merge "libgui: Plumb detachBuffer through ConsumerBase" 2015-04-07 22:38:00 +00:00
Dan Stoza
6b4f28a793 am a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master
* commit 'a53e955ad882793bb6fea00d4d110a3d8878ab57':
  libgui: Plumb attach/detach through Surface
2015-04-07 22:12:33 +00:00
Dan Stoza
634f5ee6a7 libgui: Plumb detachBuffer through ConsumerBase
Exposes IGraphicBufferConsumer::detachBuffer as a ConsumerBase
method. attachBuffer is not currently exposed, because all current
clients will be recycling buffers through the allocator.

Bug: 19628705
Change-Id: I3e519767fa43d5d880c1d5695e31b60f6ad588af
2015-04-07 15:05:40 -07:00
Dan Stoza
a53e955ad8 Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master 2015-04-07 22:03:29 +00:00
Dan Stoza
6d9e3dc5ca am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
* commit 'e55cae86e6217a86d94bf280c6c8442bef2dd908':
  libgui: Remove IGBC::BufferItem
2015-04-07 21:24:02 +00:00
Jeff Sharkey
eb3704a58e am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."
* commit '9e99fce820c2d520f5618cb620cc1e37aed57b9d':
  Switch installd to compile as C++.
2015-04-07 21:24:01 +00:00
Jeff Sharkey
f3529d9aba am dc10342d: am 2d42dc74: Merge "Valid APK paths now include expanded storage."
* commit 'dc10342dc9031883046b4b44d009a4422545e7e2':
  Valid APK paths now include expanded storage.
2015-04-07 21:24:00 +00:00
Dan Stoza
e55cae86e6 Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master 2015-04-07 21:16:33 +00:00
Jeff Sharkey
9e99fce820 am 1cd030be: Merge "Switch installd to compile as C++."
* commit '1cd030be59c108cde25234f0d2da83a68a7cdd26':
  Switch installd to compile as C++.
2015-04-07 21:13:43 +00:00
Jeff Sharkey
dc10342dc9 am 2d42dc74: Merge "Valid APK paths now include expanded storage."
* commit '2d42dc74e9b647345a5d4ba79bcdadbf700002e2':
  Valid APK paths now include expanded storage.
2015-04-07 21:13:42 +00:00
Jeff Sharkey
1cd030be59 Merge "Switch installd to compile as C++." 2015-04-07 21:04:29 +00:00
Jeff Sharkey
2d42dc74e9 Merge "Valid APK paths now include expanded storage." 2015-04-07 21:03:42 +00:00
Jeff Sharkey
19803807cd Switch installd to compile as C++.
This is the minimal change needed to switch it over to C++, which
paves the way for using more robust utilities like std::string.

Change-Id: I80ed6280146875eb6ddbbb340c05450388ca13f0
2015-04-07 14:01:43 -07:00
Jeff Sharkey
e23a13299a 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-07 14:01:12 -07:00
Dan Stoza
8ed8182756 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 231832eb27)
2015-04-07 13:50:03 -07:00
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
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
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
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
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
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
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
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
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
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
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