OSDN Git Service
Jeff Sharkey [Fri, 10 Apr 2015 21:14:54 +0000 (21:14 +0000)]
am
c200d20e: am
dfc30ae3: Merge "Command to move private app data between volumes."
* commit '
c200d20e32af042e92d03574aaededf6d81d27e0':
Command to move private app data between volumes.
Jeff Sharkey [Fri, 10 Apr 2015 21:08:43 +0000 (21:08 +0000)]
am
dfc30ae3: Merge "Command to move private app data between volumes."
* commit '
dfc30ae393fd610fcbd05a1ecfe7d4834a792de3':
Command to move private app data between volumes.
Jeff Sharkey [Fri, 10 Apr 2015 21:00:41 +0000 (21:00 +0000)]
Merge "Command to move private app data between volumes."
Jeff Sharkey [Thu, 9 Apr 2015 03:56:42 +0000 (20:56 -0700)]
Command to move private app data between volumes.
New "mvuserdata" command will move all private app data from one
volume UUID to another. It leverages the existing "cp" toybox
command to do the heavy lifting for all known users, preserving
details like timestamps and permissions. It invokes restorecon()
to correctly label the new location when the copy is finished.
Changes installd to no longer drop capabilities, so we run as root
again. This also allows us to exec "cp" with CAP_DAC_OVERRIDE and
CAP_FOWNER still in effect.
Bug:
19993667
Change-Id: I1f407a7c4a1af97ca5afc27b04eb16b4936cbdef
Jeff Sharkey [Thu, 9 Apr 2015 21:57:30 +0000 (21:57 +0000)]
am
997eb5dd: am
44a38d93: Merge "Start accepting volume UUIDs from framework."
* commit '
997eb5ddfb4ae83a95b0f90837ba67664e79acb0':
Start accepting volume UUIDs from framework.
Jeff Sharkey [Thu, 9 Apr 2015 21:47:30 +0000 (21:47 +0000)]
am
44a38d93: Merge "Start accepting volume UUIDs from framework."
* commit '
44a38d9337989742046c1e3faa6e7392ecc47cd4':
Start accepting volume UUIDs from framework.
Jeff Sharkey [Thu, 9 Apr 2015 21:41:11 +0000 (21:41 +0000)]
Merge "Start accepting volume UUIDs from framework."
Jeff Sharkey [Thu, 9 Apr 2015 20:10:03 +0000 (13:10 -0700)]
Start accepting volume UUIDs from framework.
We're now parsing and passing through volume UUIDs sent across the
command socket. The "!" argument value is treated as null, which
means internal storage.
Bug:
19993667
Change-Id: I17729a769ce687a2e94e85991a6338c77ded0b66
Jeff Sharkey [Thu, 9 Apr 2015 20:03:58 +0000 (20:03 +0000)]
am
25327881: am
066fadb9: Merge "More volume UUID awareness."
* commit '
25327881e339bd88045e0ecf17185d2edb479d7c':
More volume UUID awareness.
Jeff Sharkey [Thu, 9 Apr 2015 19:53:33 +0000 (19:53 +0000)]
am
066fadb9: Merge "More volume UUID awareness."
* commit '
066fadb983b117a7682af00780d23d16232ab0e2':
More volume UUID awareness.
Jeff Sharkey [Thu, 9 Apr 2015 19:45:03 +0000 (19:45 +0000)]
Merge "More volume UUID awareness."
Jeff Sharkey [Thu, 9 Apr 2015 18:34:03 +0000 (11:34 -0700)]
More volume UUID awareness.
Teach free_cache() and restorecon_data() about building per-volume
paths. Also clean up restorecon_data() by using std::string when
building paths.
Clearer names for path building utility methods, and tests to verify.
Bug:
19993667
Change-Id: Iacfbcdaa5b901cc2490bc8eba366dfdeb44f1d93
Andreas Gampe [Thu, 9 Apr 2015 17:16:47 +0000 (17:16 +0000)]
am
cae83eca: am
f9ab2ad2: Merge "Installd: Fix Clang build"
* commit '
cae83eca2476c5f730aebaffdfb6443e6780bb2f':
Installd: Fix Clang build
Andreas Gampe [Thu, 9 Apr 2015 17:05:44 +0000 (17:05 +0000)]
am
f9ab2ad2: Merge "Installd: Fix Clang build"
* commit '
f9ab2ad2d5786b2dd04f08f5d5a67102bd3d796a':
Installd: Fix Clang build
Andreas Gampe [Thu, 9 Apr 2015 16:55:48 +0000 (16:55 +0000)]
Merge "Installd: Fix Clang build"
Andreas Gampe [Thu, 9 Apr 2015 16:52:45 +0000 (09:52 -0700)]
Installd: Fix Clang build
Remove some unused parameters and variables.
Change-Id: I507ae48fe1744b800ceb29192d463fd26c2ccda7
Jeff Sharkey [Thu, 9 Apr 2015 16:45:31 +0000 (16:45 +0000)]
am
cbde9b92: am
d107c305: Merge "Plumb through volume UUID when building paths."
* commit '
cbde9b920461225b5400abf5700eec1b62f5ce82':
Plumb through volume UUID when building paths.
Jeff Sharkey [Thu, 9 Apr 2015 16:35:20 +0000 (16:35 +0000)]
am
d107c305: Merge "Plumb through volume UUID when building paths."
* commit '
d107c305f74592e8078754b317d840a2dde661db':
Plumb through volume UUID when building paths.
Jeff Sharkey [Thu, 9 Apr 2015 16:27:18 +0000 (16:27 +0000)]
Merge "Plumb through volume UUID when building paths."
Richard Uhler [Thu, 9 Apr 2015 14:31:03 +0000 (14:31 +0000)]
am
19db8c88: am
ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."
* commit '
19db8c884bb6943113420395b581c72f2f3c6cae':
installd: Add support for SELF_PATCHOAT_NEEDED.
Richard Uhler [Thu, 9 Apr 2015 14:20:53 +0000 (14:20 +0000)]
am
ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."
* commit '
ab91d03b0dfebf40e98034670892c278ae0a46e5':
installd: Add support for SELF_PATCHOAT_NEEDED.
Richard Uhler [Thu, 9 Apr 2015 14:13:27 +0000 (14:13 +0000)]
Merge "installd: Add support for SELF_PATCHOAT_NEEDED."
Mark Salyzyn [Wed, 8 Apr 2015 21:37:14 +0000 (21:37 +0000)]
am
1b0a8702: am
ad436ab5: Merge "dumpstate: scrub APANIC"
* commit '
1b0a8702322b2b6ed2fa245cf92e87a1e5feea6c':
dumpstate: scrub APANIC
Mark Salyzyn [Wed, 8 Apr 2015 18:11:30 +0000 (18:11 +0000)]
am
ad436ab5: Merge "dumpstate: scrub APANIC"
* commit '
ad436ab54a649075b25ab755344fd011bd0c9262':
dumpstate: scrub APANIC
Mark Salyzyn [Wed, 8 Apr 2015 18:03:35 +0000 (18:03 +0000)]
Merge "dumpstate: scrub APANIC"
Mark Salyzyn [Wed, 8 Apr 2015 17:51:51 +0000 (10:51 -0700)]
dumpstate: scrub APANIC
Bug:
19525200
Change-Id: Ia2d2857cac953fb4ceafb66ddf775d89d7a777b1
Jeff Sharkey [Wed, 8 Apr 2015 01:14:05 +0000 (18:14 -0700)]
Plumb through volume UUID when building paths.
Since app data paths can live on expanded storage devices, accept the
target volume UUID when building paths. The null UUID indicates the
default internal storage.
To improve readability, start using std::string in several places,
which throws when allocations fail. For now, perform last-second
sanity checks on incoming path arguments, but we'll eventually want
to check arguments as they come through installd.cpp, instead of
crashing the entire daemon.
Also remove "lib" symlink code from install() and make_user_data(),
since we're no longer supporting /data/app-lib. The framework
already uses linklib() to create the right symlink for the selected
ISA-specific library dir.
Bug:
19993667
Change-Id: Ib9343575ffb62bf3981e19375de8f3822fc31e28
Richard Uhler [Thu, 26 Mar 2015 22:47:38 +0000 (15:47 -0700)]
installd: Add support for SELF_PATCHOAT_NEEDED.
Change-Id: Ib9a6373f98474f1242367b5285086251a9d580e5
Dan Stoza [Tue, 7 Apr 2015 22:58:47 +0000 (22:58 +0000)]
am
5977851b: am
00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"
* commit '
5977851b80549f24cd9164ec075b79c6c6291fa5':
libgui: Plumb detachBuffer through ConsumerBase
Dan Stoza [Tue, 7 Apr 2015 22:47:50 +0000 (22:47 +0000)]
am
00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"
* commit '
00afb8177fdbf144c75c00e9eacc915589807d35':
libgui: Plumb detachBuffer through ConsumerBase
Dan Stoza [Tue, 7 Apr 2015 22:38:00 +0000 (22:38 +0000)]
Merge "libgui: Plumb detachBuffer through ConsumerBase"
Dan Stoza [Tue, 7 Apr 2015 22:12:33 +0000 (22:12 +0000)]
am
a53e955a: Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master
* commit '
a53e955ad882793bb6fea00d4d110a3d8878ab57':
libgui: Plumb attach/detach through Surface
Dan Stoza [Fri, 3 Apr 2015 21:22:05 +0000 (14:22 -0700)]
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
Dan Stoza [Tue, 7 Apr 2015 22:00:36 +0000 (22:00 +0000)]
Merge "libgui: Plumb attach/detach through Surface" into stage-aosp-master
Dan Stoza [Tue, 7 Apr 2015 21:24:02 +0000 (21:24 +0000)]
am
e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
* commit '
e55cae86e6217a86d94bf280c6c8442bef2dd908':
libgui: Remove IGBC::BufferItem
Jeff Sharkey [Tue, 7 Apr 2015 21:24:01 +0000 (21:24 +0000)]
am
9e99fce8: am
1cd030be: Merge "Switch installd to compile as C++."
* commit '
9e99fce820c2d520f5618cb620cc1e37aed57b9d':
Switch installd to compile as C++.
Jeff Sharkey [Tue, 7 Apr 2015 21:24:00 +0000 (21:24 +0000)]
am
dc10342d: am
2d42dc74: Merge "Valid APK paths now include expanded storage."
* commit '
dc10342dc9031883046b4b44d009a4422545e7e2':
Valid APK paths now include expanded storage.
Dan Stoza [Tue, 7 Apr 2015 21:16:33 +0000 (21:16 +0000)]
Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
Jeff Sharkey [Tue, 7 Apr 2015 21:13:43 +0000 (21:13 +0000)]
am
1cd030be: Merge "Switch installd to compile as C++."
* commit '
1cd030be59c108cde25234f0d2da83a68a7cdd26':
Switch installd to compile as C++.
Jeff Sharkey [Tue, 7 Apr 2015 21:13:42 +0000 (21:13 +0000)]
am
2d42dc74: Merge "Valid APK paths now include expanded storage."
* commit '
2d42dc74e9b647345a5d4ba79bcdadbf700002e2':
Valid APK paths now include expanded storage.
Jeff Sharkey [Tue, 7 Apr 2015 21:04:28 +0000 (21:04 +0000)]
Merge "Switch installd to compile as C++."
Jeff Sharkey [Tue, 7 Apr 2015 21:03:41 +0000 (21:03 +0000)]
Merge "Valid APK paths now include expanded storage."
Jeff Sharkey [Tue, 7 Apr 2015 19:44:51 +0000 (12:44 -0700)]
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
Jeff Sharkey [Mon, 6 Apr 2015 23:19:39 +0000 (16:19 -0700)]
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
Dan Stoza [Wed, 11 Mar 2015 18:55:01 +0000 (11:55 -0700)]
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
231832eb27107fb561467f5f4a9be2c577c61ea8)
Dan Stoza [Fri, 13 Mar 2015 21:40:34 +0000 (14:40 -0700)]
libgui: Remove IGBC::BufferItem
Removes IGraphicBufferConsumer::BufferItem. Depends on the
following changes:
I187b3a7d05196b6289596afac8fb9a9d4aebff76
I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc
Change-Id: I3edf0db8fba656fd78e18a5a7f1137f0fb6b237d
(cherry picked from commit
1c87e474d87d6d1380fb61d476d606b1a2fda1c1)
Fyodor Kupolov [Tue, 7 Apr 2015 20:27:49 +0000 (20:27 +0000)]
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
Fyodor Kupolov [Tue, 7 Apr 2015 20:18:23 +0000 (20:18 +0000)]
am
8f43f77d: Merge "Use AID_SYSTEM as uid when creating oat dir"
* commit '
8f43f77de89df935e7dc2fdeddee132580bb5705':
Use AID_SYSTEM as uid when creating oat dir
Fyodor Kupolov [Tue, 7 Apr 2015 20:09:43 +0000 (20:09 +0000)]
Merge "Use AID_SYSTEM as uid when creating oat dir"
Fyodor Kupolov [Tue, 7 Apr 2015 02:09:02 +0000 (19:09 -0700)]
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
Dan Stoza [Tue, 7 Apr 2015 18:14:37 +0000 (18:14 +0000)]
Merge "Cherry-pick dataSpace and BufferItem changes" into lmp-mr1-dev-plus-aosp
Eino-Ville Talvala [Fri, 20 Feb 2015 00:10:43 +0000 (16:10 -0800)]
Cherry-pick dataSpace and BufferItem changes
Add dataSpace to buffer queues; remove old format enums.
(cherry picked from commit
82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02)
libgui: Prepare for IGBC::BufferItem removal
(cherry picked from commit
cf3834db104e0b052056e3a06d46e3f222f0d372)
SurfaceFlinger: Stop using IGBC::BufferItem
(cherry picked from commit
11611f9be590480d7ea27bf0153558573ddcded2)
Change-Id: Ic2e4770b916d2d1477e5ce98c4b49a0072ea03ff
(cherry picked from commit
6c450101753d0219b151e79007bcded1bfbb058b)
Elliott Hughes [Mon, 6 Apr 2015 23:30:25 +0000 (23:30 +0000)]
am
46072d58: am
a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
* commit '
46072d5834aaef51922667972f02241a220333b8':
Remove useless 'svcmgr_handle' (which had wrong type).
Elliott Hughes [Mon, 6 Apr 2015 23:19:41 +0000 (23:19 +0000)]
am
a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
* commit '
a60ff367a4f55ea319625cf500687c5025604f40':
Remove useless 'svcmgr_handle' (which had wrong type).
Elliott Hughes [Mon, 6 Apr 2015 23:13:27 +0000 (23:13 +0000)]
Merge "Remove useless 'svcmgr_handle' (which had wrong type)."
Eino-Ville Talvala [Mon, 6 Apr 2015 21:15:33 +0000 (21:15 +0000)]
am
6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
* commit '
6c450101753d0219b151e79007bcded1bfbb058b':
DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
Eino-Ville Talvala [Fri, 20 Feb 2015 00:10:43 +0000 (16:10 -0800)]
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
82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02)
DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal
(cherry picked from commit
cf3834db104e0b052056e3a06d46e3f222f0d372)
DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem
(cherry picked from commit
11611f9be590480d7ea27bf0153558573ddcded2)
Elliott Hughes [Fri, 3 Apr 2015 23:51:18 +0000 (16:51 -0700)]
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
Elliott Hughes [Sat, 4 Apr 2015 00:19:19 +0000 (00:19 +0000)]
am
8d9f899a: am
031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"
* commit '
8d9f899a5e69a652c59d48c70a9c7b0e8100be87':
ServiceManager: Print kernel/userspace binder version
Elliott Hughes [Sat, 4 Apr 2015 00:13:25 +0000 (00:13 +0000)]
am
031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"
* commit '
031fec0b9da7f5985c5a1650ed570ca3872e63c0':
ServiceManager: Print kernel/userspace binder version
Elliott Hughes [Sat, 4 Apr 2015 00:03:45 +0000 (00:03 +0000)]
Merge "ServiceManager: Print kernel/userspace binder version"
Serban Constantinescu [Wed, 19 Feb 2014 15:34:02 +0000 (15:34 +0000)]
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>
Dan Stoza [Fri, 3 Apr 2015 16:29:54 +0000 (16:29 +0000)]
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
Dan Stoza [Fri, 3 Apr 2015 16:19:55 +0000 (16:19 +0000)]
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
Dan Stoza [Fri, 3 Apr 2015 16:10:12 +0000 (16:10 +0000)]
Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"
Fyodor Kupolov [Fri, 3 Apr 2015 00:26:42 +0000 (00:26 +0000)]
am
ebca76c2: am
9cad1985: Merge "Fix errors caused by unused variables"
* commit '
ebca76c23215579a23dde144d1950037d52452bf':
Fix errors caused by unused variables
Fyodor Kupolov [Fri, 3 Apr 2015 00:16:38 +0000 (00:16 +0000)]
am
9cad1985: Merge "Fix errors caused by unused variables"
* commit '
9cad1985880f700be3150f05ca3539444da850d2':
Fix errors caused by unused variables
Fyodor Kupolov [Fri, 3 Apr 2015 00:04:25 +0000 (00:04 +0000)]
Merge "Fix errors caused by unused variables"
Fyodor Kupolov [Thu, 2 Apr 2015 23:59:10 +0000 (16:59 -0700)]
Fix errors caused by unused variables
Change-Id: Ie52ae0e9a642504ee7b78c6bc54b61549cfb0342
Fyodor Kupolov [Thu, 2 Apr 2015 23:27:40 +0000 (23:27 +0000)]
am
63750cb6: am
4eb88f88: Merge "Support for storing OAT files in app directory"
* commit '
63750cb6969c5cf70df5d9bfc571ee107456ed5a':
Support for storing OAT files in app directory
Fyodor Kupolov [Thu, 2 Apr 2015 23:20:59 +0000 (23:20 +0000)]
am
4eb88f88: Merge "Support for storing OAT files in app directory"
* commit '
4eb88f883911eb1208e85a9c176481176242af13':
Support for storing OAT files in app directory
Andreas Gampe [Thu, 2 Apr 2015 23:11:45 +0000 (23:11 +0000)]
am
2cc42f0b: (-s ours) Installd: Support dex2oat threads system property
* commit '
2cc42f0bb3db6ff63fec4cbc282fa8af33d82fca':
Installd: Support dex2oat threads system property
Fyodor Kupolov [Thu, 2 Apr 2015 23:11:01 +0000 (23:11 +0000)]
Merge "Support for storing OAT files in app directory"
Dan Stoza [Wed, 11 Mar 2015 18:55:01 +0000 (11:55 -0700)]
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
c14ecb9de243af8864610fd3c74342e3ca2cb4bc)
Mark Salyzyn [Wed, 1 Apr 2015 19:48:52 +0000 (19:48 +0000)]
am
0f9bf17a: am
23b204e1: Merge "servicemanager: service_manager missing include for string.h"
* commit '
0f9bf17ad6caf7cec9043b1330cd3387b8881c0f':
servicemanager: service_manager missing include for string.h
Mark Salyzyn [Wed, 1 Apr 2015 19:38:00 +0000 (19:38 +0000)]
am
23b204e1: Merge "servicemanager: service_manager missing include for string.h"
* commit '
23b204e1ee9069b9321b5547e8d17a5014efbacd':
servicemanager: service_manager missing include for string.h
Mark Salyzyn [Wed, 1 Apr 2015 19:26:22 +0000 (19:26 +0000)]
Merge "servicemanager: service_manager missing include for string.h"
Dan Stoza [Wed, 1 Apr 2015 18:58:38 +0000 (18:58 +0000)]
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
Dan Stoza [Wed, 1 Apr 2015 18:48:14 +0000 (18:48 +0000)]
am
ef62116d: (-s ours) Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"
* commit '
ef62116d802237ebac77465d6ff6779ecfe038ae':
DO NOT MERGE libgui: Remove IGBC::BufferItem
Dan Stoza [Wed, 1 Apr 2015 18:41:24 +0000 (18:41 +0000)]
Merge "DO NOT MERGE libgui: Remove IGBC::BufferItem"
Mark Salyzyn [Wed, 1 Apr 2015 14:52:12 +0000 (07:52 -0700)]
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
Andreas Gampe [Tue, 31 Mar 2015 01:45:03 +0000 (18:45 -0700)]
Installd: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in installd and pass to dex2oat.
Bug:
19992386
(cherry picked from commit
8d7af8b2418cc5e7e59746f0cb359a75ed0bdfd1)
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
Andreas Gampe [Tue, 31 Mar 2015 03:31:30 +0000 (03:31 +0000)]
am
8c60cec0: am
5881c8dd: Merge "Installd: Support dex2oat threads system property"
* commit '
8c60cec0cf9356842b7d24c33b1d056e0785626b':
Installd: Support dex2oat threads system property
Andreas Gampe [Tue, 31 Mar 2015 03:24:59 +0000 (03:24 +0000)]
am
5881c8dd: Merge "Installd: Support dex2oat threads system property"
* commit '
5881c8dd3b5b290cddca0e0f01e2c2f1641826b0':
Installd: Support dex2oat threads system property
Andreas Gampe [Tue, 31 Mar 2015 03:20:15 +0000 (03:20 +0000)]
Merge "Installd: Support dex2oat threads system property"
Andreas Gampe [Tue, 31 Mar 2015 01:45:03 +0000 (18:45 -0700)]
Installd: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in installd and pass to dex2oat.
Bug:
19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
Fyodor Kupolov [Tue, 3 Mar 2015 20:25:29 +0000 (12:25 -0800)]
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
John Reck [Fri, 27 Mar 2015 00:28:25 +0000 (00:28 +0000)]
am
88c52865: am
0faebfb2: Merge "Add trace_event_clock_sync to atrace"
* commit '
88c52865f37d9b45c2610b4078bc73f392864572':
Add trace_event_clock_sync to atrace
John Reck [Fri, 27 Mar 2015 00:21:41 +0000 (00:21 +0000)]
am
0faebfb2: Merge "Add trace_event_clock_sync to atrace"
* commit '
0faebfb2f5a07939e7264a94fdcebecc4df39873':
Add trace_event_clock_sync to atrace
John Reck [Fri, 27 Mar 2015 00:13:32 +0000 (00:13 +0000)]
Merge "Add trace_event_clock_sync to atrace"
John Reck [Thu, 26 Mar 2015 22:31:35 +0000 (15:31 -0700)]
Add trace_event_clock_sync to atrace
Change-Id: I8adce15210d82df09ff3a39ddd8df617aeb16a42
Richard Uhler [Thu, 26 Mar 2015 15:11:28 +0000 (15:11 +0000)]
am
b84a3dde: am
bc5aceb1: Merge "Store odex files in oat/<isa>/ directory."
* commit '
b84a3dde3583c7c8696679ffaad25c334e85e3cb':
Store odex files in oat/<isa>/ directory.
Richard Uhler [Thu, 26 Mar 2015 15:04:46 +0000 (15:04 +0000)]
am
bc5aceb1: Merge "Store odex files in oat/<isa>/ directory."
* commit '
bc5aceb1f0a68e96dced1d843278b3bf14504f2c':
Store odex files in oat/<isa>/ directory.
Richard Uhler [Thu, 26 Mar 2015 14:57:35 +0000 (14:57 +0000)]
Merge "Store odex files in oat/<isa>/ directory."
Richard Uhler [Wed, 18 Mar 2015 19:39:09 +0000 (12:39 -0700)]
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
Jesse Hall [Tue, 24 Mar 2015 21:06:56 +0000 (21:06 +0000)]
am
c2a5b469: am
a527c07b: Merge "Fix mistake using width instead of height."
* commit '
c2a5b469a311891d8e3025aea0e4b348044dfaeb':
Fix mistake using width instead of height.
Jesse Hall [Tue, 24 Mar 2015 20:59:51 +0000 (20:59 +0000)]
am
a527c07b: Merge "Fix mistake using width instead of height."
* commit '
a527c07b8d078f7da1114b7055f65b479a148729':
Fix mistake using width instead of height.
Jesse Hall [Tue, 24 Mar 2015 20:52:51 +0000 (20:52 +0000)]
Merge "Fix mistake using width instead of height."
Christopher Ferris [Mon, 23 Mar 2015 21:32:15 +0000 (14:32 -0700)]
Fix mistake using width instead of height.
Found by rodrigo.chiossi@intel.com.
Change-Id: I49d590ed39f6b47ba58a77a75d66b2964ea1cb1d
Mathieu Chartier [Sat, 21 Mar 2015 17:07:45 +0000 (17:07 +0000)]
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