OSDN Git Service
Jeff Brown [Wed, 12 Feb 2014 00:26:19 +0000 (00:26 +0000)]
am
ed4d28dd: Add method to apply offset to PointerCoords. (DO NOT MERGE)
* commit '
ed4d28dd70448b13eb74a3166ec8d1c1a530e2d4':
Add method to apply offset to PointerCoords. (DO NOT MERGE)
Jeff Brown [Tue, 11 Feb 2014 22:28:48 +0000 (14:28 -0800)]
Add method to apply offset to PointerCoords. (DO NOT MERGE)
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
Dianne Hackborn [Tue, 11 Feb 2014 21:41:23 +0000 (21:41 +0000)]
am
6c14f0ad: Merge "Runtime resource overlay, iteration 2"
* commit '
6c14f0ad82be418c742e56fe586657ea0f394b05':
Runtime resource overlay, iteration 2
Dianne Hackborn [Tue, 11 Feb 2014 21:27:35 +0000 (21:27 +0000)]
Merge "Runtime resource overlay, iteration 2"
Dianne Hackborn [Tue, 11 Feb 2014 20:35:42 +0000 (20:35 +0000)]
am
340aa8cb: Merge "New command line tool \'idmap\'"
* commit '
340aa8cbd4afbb68b16f369336cc1c202582f021':
New command line tool 'idmap'
Dianne Hackborn [Tue, 11 Feb 2014 20:29:54 +0000 (20:29 +0000)]
Merge "New command line tool 'idmap'"
Adam Lesinski [Thu, 6 Feb 2014 19:30:54 +0000 (19:30 +0000)]
am
0f0ccf07: Add new software features
* commit '
0f0ccf07bad594b618f4fcce9a8f79a5bc188bb3':
Add new software features
Colin Cross [Thu, 6 Feb 2014 02:59:37 +0000 (02:59 +0000)]
am
74be0f7b: Merge "binder: fix all warnings"
* commit '
74be0f7be35e7b40a322fa9a407cb49265333a0b':
binder: fix all warnings
Colin Cross [Thu, 6 Feb 2014 02:06:42 +0000 (02:06 +0000)]
Merge "binder: fix all warnings"
Colin Cross [Thu, 6 Feb 2014 01:42:44 +0000 (17:42 -0800)]
binder: fix all warnings
Fix warnings related to casting pointers to ints, using %d or %ld to
print size_t/ssize_t, and unused parameters.
Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e
Adam Lesinski [Wed, 5 Feb 2014 02:03:52 +0000 (18:03 -0800)]
Add new software features
Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.
Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).
Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a
Andrew Hsieh [Wed, 5 Feb 2014 07:58:00 +0000 (07:58 +0000)]
am
055dac1b: Merge "Fixed apparent copy/paste mistake Bug:
11634373"
* commit '
055dac1b54af46a0608b32e83fcae45e75a4a8f0':
Fixed apparent copy/paste mistake Bug:
11634373
Andrew Hsieh [Wed, 5 Feb 2014 07:16:30 +0000 (07:16 +0000)]
Merge "Fixed apparent copy/paste mistake Bug:
11634373"
David Friedman [Wed, 5 Feb 2014 03:11:33 +0000 (11:11 +0800)]
Fixed apparent copy/paste mistake
Bug:
11634373
Change-Id: I9b0ac4d3b4a9a2999b2013abd39465a062ec51ea
Siva Velusamy [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am
fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"
* commit '
fd6a3ff4b4dda34f8e6e03989dd7466e4cbd8b0e':
GLES_trace: fix compile errors on 64 bit architectures
Siva Velusamy [Tue, 4 Feb 2014 19:14:06 +0000 (19:14 +0000)]
Merge "GLES_trace: fix compile errors on 64 bit architectures"
Changwan Ryu [Tue, 4 Feb 2014 07:31:42 +0000 (07:31 +0000)]
am
e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
* commit '
e636692a2eecead363f06297e7b5b379079331da':
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
Arve Hjønnevåg [Tue, 4 Feb 2014 02:01:45 +0000 (02:01 +0000)]
am
4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
* commit '
4e7fd9506103dcc9750788caf1f94b8d1348f37b':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Arve Hjønnevåg [Tue, 4 Feb 2014 00:48:12 +0000 (00:48 +0000)]
Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
Arve Hjønnevåg [Mon, 3 Feb 2014 22:46:30 +0000 (14:46 -0800)]
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Change-Id: I46a29939fa29ec9421ab6dff3285502f69a31745
Arve Hjønnevåg [Mon, 3 Feb 2014 21:18:35 +0000 (21:18 +0000)]
am
58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
* commit '
58242fc29881cf29d56ee6e5fde6d73b16d0b67c':
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
Arve Hjønnevåg [Mon, 3 Feb 2014 21:12:57 +0000 (21:12 +0000)]
Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
* changes:
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
Mårten Kongstad [Fri, 31 Jan 2014 13:42:59 +0000 (14:42 +0100)]
Runtime resource overlay, iteration 2
Support any number of overlay packages. Support any target package.
UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes
<overlay targetPackage="com.target.package"/>
For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.
THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').
UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.
Zygote initialization
Initial AssetManager object created
+ idmap --scan creates idmaps for overlays targeting 'android', \
stores list of overlays in /data/resource-cache/overlays.list
AssetManager caches framework-res.apk
+ AssetManager caches overlay packages listed in overlays.list
Android boot
New AssetManager's ResTable acquired
AssetManager re-uses cached framework-res.apk
+ AssetManager re-uses cached 'android' overlays (if any)
App boot
ActivityThread prepares AssetManager to load app.apk
+ ActivityThread prepares AssetManager to load app overlays (if any)
New AssetManager's ResTable acquired as per Android boot
SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.
LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.
When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.
Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:
<overlay targetPackage="com.target.package" priority="1234"/>
Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.
Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.
The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.
+------+------+- -+------+------+
| 0x01 | | ... | | 0x7f |
+------+------+- -+------+------+
| |
"android" Target package A
|
Pre-installed overlay B (priority 1)
|
Pre-installed overlay C (priority 2)
Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
Mårten Kongstad [Fri, 31 Jan 2014 13:00:54 +0000 (14:00 +0100)]
New command line tool 'idmap'
Introduce a new tool 'idmap' to handle generation and verification of
idmap files. The tool is modelled on 'dexopt', and is intended to be
used similarly, notably by 'installd'.
See cmds/idmap/idmap.cpp for further documentation on 'idmap'.
Note: this commit is interdependent on a commit in project build/ to add
'idmap' to PRODUCT_PACKAGES.
Note: the changes to androidfw are only stubs. The actual implementation
will be provided in Runtime resource overlay, iteration 2.
Change-Id: I7131b74ece1e46c8a9c0a31d103e686aa07da2bb
Changwan Ryu [Mon, 28 Oct 2013 02:32:47 +0000 (11:32 +0900)]
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above
supports component extension APIs, which enable us to add our own constants
and definitions.
Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3
Arve Hjønnevåg [Wed, 29 Jan 2014 05:35:03 +0000 (21:35 -0800)]
ServiceManager: Implement PING_TRANSACTION
Stop printing "invalid id " to stderr every time a process tries to
connect to the servicemanager.
Change-Id: Ib0e5a0375bfa2dec2c2f9cd668bd5dda46ed6588
Arve Hjønnevåg [Wed, 29 Jan 2014 05:25:12 +0000 (21:25 -0800)]
ServiceManager: Use 32/64 bit types from new binder header
Change-Id: I1bd7c38ed9f43125cf9c63aa533434ee7ca06f80
Arve Hjønnevåg [Wed, 29 Jan 2014 04:12:59 +0000 (20:12 -0800)]
Binder: Use 64 bit pointers in 32 processes if selected by the target
Uses new kernel header where void * has been replaced by binder_uintptr_t
Change-Id: Icfc67c2a279269f700343bd9246fd7cb94efe2c1
Arve Hjønnevåg [Wed, 29 Jan 2014 03:57:02 +0000 (19:57 -0800)]
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Change-Id: I96c643123b0314c361b7f48a18d5c22c660d4ff5
Aravind Akella [Fri, 31 Jan 2014 22:39:41 +0000 (22:39 +0000)]
am
ebff73c3: Bug fix for SensorFusion data rate.
* commit '
ebff73c37d5f1581702430f4a0348c160b99b57e':
Bug fix for SensorFusion data rate.
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug:
12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
Brian Carlstrom [Fri, 31 Jan 2014 12:34:20 +0000 (12:34 +0000)]
am
af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
af3efe8ce7e2eeb7a98552af5cf38d8a9720f018':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
Serban Constantinescu [Tue, 5 Nov 2013 16:53:55 +0000 (16:53 +0000)]
Binder: Make binder portable
Changes include
- Binder attempts to cast pointers to a int datatype
which is not sufficient on a 64-bit platform.
- This patch introduces new read/write functions into
Parcel that allow pointers to be written using the
uintptr_t datatype for compile-time data type size
selection.
- Change access specifier for the methods above.
- Binder uses the 64bit android_atomic_release_cas64
(aka cmpxchg)
Change-Id: I595280541e0ba1d19c94b2ca2127bf9d96efabf1
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 19 Dec 2013 09:11:41 +0000 (09:11 +0000)]
ServiceManager: Fix the binder interface
This patch adds support for binder transactions on 64bit systems
without breaking the existing 32bit ABI. It has been tested on
the Android emulator and ARMv8 Model.
Most of the changes in this patch just follow the binder ABI.
Change-Id: I8c37b847ea65008d56554d34d4696fe3d22f7533
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 30 Jan 2014 14:07:34 +0000 (14:07 +0000)]
ServiceManager: Store handles in uint32_t instead of void *
This patch corrects the types used for storing handles.
Change-Id: If9c10782345f1de9e12b4b3fd6be9e02e6b568cd
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Fri, 10 Jan 2014 15:48:29 +0000 (15:48 +0000)]
ServiceManager: Generic Fixes
This patch fixes some of the ServiceManager issues. The following patches
of the series add fixes to the ABI.
Change-Id: Ib479234c8704e12592f1b149ddec67881bc50230
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 30 Jan 2014 15:16:45 +0000 (15:16 +0000)]
ServiceManager: Add extra error handling
This patch extends the error handling. It also adds a check for a matching
binder version - kernel/userspace.
Change-Id: I43a262934b38c5711536aaa42754fed1ef04b39e
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 30 Jan 2014 14:58:32 +0000 (14:58 +0000)]
ServiceManager: Fix Android.mk
This patch fixes Android.mk and enables building bctest as an optional
module without any extra hacks.
Change-Id: Icaf8bf9452776db2ea4a2ba75f3abf05b4e2cdab
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Fri, 10 Jan 2014 13:56:27 +0000 (13:56 +0000)]
ServiceManager: Make use of kernel exported structures
This patch switches ServiceManager to use the structures exported in the
kernel headers rather then redefining its own.
struct binder_txn is replaced with struct binder_transaction_data and struct
binder_object with struct flat_binder_object, both defined in the binder driver
header <linux/binder.h>.
Change-Id: I3b3e97918173ea35a289e184774ae06193192da3
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Brian Carlstrom [Thu, 30 Jan 2014 21:50:56 +0000 (21:50 +0000)]
Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I6b40317eceb3d89b0acff88238a9a9ab423c4d78
Siva Velusamy [Tue, 28 Jan 2014 22:08:46 +0000 (14:08 -0800)]
GLES_trace: fix compile errors on 64 bit architectures
GLES_trace passes some pointers back to the host. Encode them
using int64's rather than int32's
This fix requires an update to the host tool to look at pointers
as 64 bit, and if not found, then fall back to 32 bit integers.
Change-Id: I11ff2ca51290f05913c1b9143cecee1caf015543
Jesse Hall [Tue, 28 Jan 2014 18:24:10 +0000 (18:24 +0000)]
am
f65ebc3b: am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:22:35 +0000 (18:22 +0000)]
am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
f5bcb391c5a4282fa5fe14856faf1423a2bc44c5':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:17:46 +0000 (18:17 +0000)]
Merge "SurfaceFlinger: mFbProducerSlot initailization"
mayank parshar [Thu, 23 Jan 2014 09:38:31 +0000 (15:08 +0530)]
SurfaceFlinger: mFbProducerSlot initailization
b/
12487813
SurfaceFlinger crash is observed during simulation of
Secondary display
Note: change
14e8b01a761180250671f3d6494532d8bd04fa8e
removed the initialization leading to the crash when
simulating secondary display. Restore the initialization
to solve the problem.
Change-Id: Iae5845fb82735e01de5cc0dc582d13c27e3c614f
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Colin Cross [Tue, 28 Jan 2014 02:29:37 +0000 (02:29 +0000)]
am
689a7f30: am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
689a7f30ccd2e57eaadecedbe30690e2a44ce23a':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:27:41 +0000 (02:27 +0000)]
am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
851b2cb18c329e0d19f9f56f68425b714007a274':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:22:11 +0000 (02:22 +0000)]
Merge "Make libEGL build cleanly under 64-bit"
Dan Stoza [Fri, 17 Jan 2014 19:38:34 +0000 (11:38 -0800)]
Make libEGL build cleanly under 64-bit
Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
Colin Cross [Tue, 28 Jan 2014 01:02:49 +0000 (01:02 +0000)]
am
a21ba585: am
55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
a21ba5856b6d3bdfcef183e09aa658e69ddb4786':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:59:40 +0000 (00:59 +0000)]
am
55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
55f0668ffd6fd7889e027b3072bf173a7ee48f08':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:48:31 +0000 (00:48 +0000)]
Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Jesse Hall [Sun, 26 Jan 2014 16:47:45 +0000 (16:47 +0000)]
am
8c303f7e: am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
8c303f7e64b3de7748922e6f951d9e82bc96badd':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 16:45:40 +0000 (08:45 -0800)]
am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
fcf9c1bafb251c186191b9d066ed00d0b59b962a':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 08:15:15 +0000 (08:15 +0000)]
Merge "SurfaceFlinger: mFbFence initialization"
mayank parshar [Fri, 10 Jan 2014 04:57:45 +0000 (10:27 +0530)]
SurfaceFlinger: mFbFence initialization
MobC00383030
b/
12487813
SurfaceFlinger crash is observed while connecting
to Wi-Fi display.
Note: change
14e8b01a761180250671f3d6494532d8bd04fa8e
removed the initialization leading to the crash when
running through the HWC composition path. Restore the
initialization to solve the problem.
Change-Id: I581defc7135ac512080c0da06a62b1dae7d218c4
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Colin Cross [Sat, 25 Jan 2014 00:44:54 +0000 (00:44 +0000)]
am
e3aeefd1: am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:42:36 +0000 (16:42 -0800)]
am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:38:15 +0000 (00:38 +0000)]
Merge "libGLES_android: fix 64-bit compile errors"
Colin Cross [Fri, 24 Jan 2014 22:35:39 +0000 (14:35 -0800)]
libGLES_android: fix 64-bit compile errors
Fix size of vertex_t on 64-bit architectures
Fix __get_tls casts, the TLS area is a void**
Cast through uintptr_t to store integers in a pointer
Use %zu to print size_t
Change-Id: I91079ec76025237e6d2081784c5348518b0ce122
Jesse Hall [Fri, 3 Jan 2014 18:31:54 +0000 (18:31 +0000)]
am
e5f7bf74: am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2':
Implement per-display EGLConfig and configless EGLContext
Jesse Hall [Fri, 3 Jan 2014 18:31:53 +0000 (18:31 +0000)]
am
6c7dcfa9: am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
6c7dcfa956847a9f061fd1b2baa9dc43585599af':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:30:11 +0000 (10:30 -0800)]
am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
b6c2100458bd4dda880ec24dc7d1f39825d5243d':
Implement per-display EGLConfig and configless EGLContext
Jesse Hall [Fri, 3 Jan 2014 18:30:10 +0000 (10:30 -0800)]
am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
662d3134cb3fe3f18a0a6bfbc24368c2291c8e19':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:25:07 +0000 (18:25 +0000)]
Merge "Implement per-display EGLConfig and configless EGLContext"
Jesse Hall [Fri, 3 Jan 2014 18:24:30 +0000 (18:24 +0000)]
Merge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Tue, 24 Dec 2013 05:02:15 +0000 (21:02 -0800)]
Implement per-display EGLConfig and configless EGLContext
Bug:
12230666
Change-Id: Icca608b108cbdcab9cf01a9236d8cdbda000a836
Signed-off-by: Jesse Hall <jessehall@google.com>
Jesse Hall [Tue, 24 Dec 2013 04:44:38 +0000 (20:44 -0800)]
Move EGLConfig selection to RenderEngine
Bug:
12230666
Change-Id: I8d1111a7e0fd9d9e2525e6a80da8ce46d7dd085d
Signed-off-by: Jesse Hall <jessehall@google.com>
Brian Carlstrom [Thu, 19 Dec 2013 07:25:24 +0000 (07:25 +0000)]
am
c1bf6fa9: am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
c1bf6fa9495b21f25e7ab1a491b918df71be6e1a':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:21:51 +0000 (23:21 -0800)]
am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:13:03 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"
Nick Kralevich [Tue, 17 Dec 2013 23:12:20 +0000 (23:12 +0000)]
am
e7394ba8: am
c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit '
e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
restorecon /data/media when re-creating it for multi-user upgrade.
Nick Kralevich [Tue, 17 Dec 2013 23:08:30 +0000 (15:08 -0800)]
am
c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit '
c02c35fbdc90acbb6483fddd9a8822a16a63689d':
restorecon /data/media when re-creating it for multi-user upgrade.
Nick Kralevich [Tue, 17 Dec 2013 23:02:36 +0000 (23:02 +0000)]
Merge "restorecon /data/media when re-creating it for multi-user upgrade."
Stephen Smalley [Tue, 17 Dec 2013 21:04:20 +0000 (16:04 -0500)]
restorecon /data/media when re-creating it for multi-user upgrade.
Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Brian Carlstrom [Fri, 13 Dec 2013 07:13:18 +0000 (23:13 -0800)]
Track Looper decoupling from ALooper
Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa
Todd Poynor [Fri, 22 Nov 2013 23:44:22 +0000 (15:44 -0800)]
dumpstate: dump console-ramoops instead of last_kmsg if present
Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33
The Android Open Source Project [Fri, 6 Dec 2013 01:26:03 +0000 (17:26 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:18 +0000 (12:38 -0800)]
Jesse Hall [Tue, 3 Dec 2013 05:19:56 +0000 (21:19 -0800)]
am
708602cc: Merge "DispSync: remove delay when enabling vsync events"
* commit '
708602ccaad0f6e896c4bd4457503614b9ee81d0':
DispSync: remove delay when enabling vsync events
Jesse Hall [Tue, 3 Dec 2013 05:12:31 +0000 (05:12 +0000)]
Merge "DispSync: remove delay when enabling vsync events"
Jamie Gennis [Tue, 29 Oct 2013 20:36:12 +0000 (13:36 -0700)]
DispSync: remove delay when enabling vsync events
This change fixes a bug that caused an extra frame of latency when enabling
vsync event callbacks in DispSync. The bug was related to the logic that
prevents the two events from firing with very little time between them due to
updates to the vsync model.
Bug:
11479720
Change-Id: Ie7eaff9e92ffb7b7b6cb4d3d4402c96cbd29af7e
Nick Kralevich [Wed, 27 Nov 2013 21:16:46 +0000 (13:16 -0800)]
am
bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."
* commit '
bef08b8d1b30976ff273fc9041bc8d934f52fea9':
Handle policy reloads within installd rather than restarting it.
Nick Kralevich [Wed, 27 Nov 2013 21:09:12 +0000 (21:09 +0000)]
Merge "Handle policy reloads within installd rather than restarting it."
Dima Zavin [Sat, 23 Nov 2013 20:36:54 +0000 (12:36 -0800)]
am
63b62e8c: am
66ad04bc: Merge "Remove incompatible ashmem.h"
* commit '
63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
Remove incompatible ashmem.h
Dima Zavin [Sat, 23 Nov 2013 04:45:07 +0000 (20:45 -0800)]
am
66ad04bc: Merge "Remove incompatible ashmem.h"
* commit '
66ad04bc039c73763c55c8d3aad282378e05d257':
Remove incompatible ashmem.h
Dima Zavin [Sat, 23 Nov 2013 04:41:17 +0000 (04:41 +0000)]
Merge "Remove incompatible ashmem.h"
The Android Open Source Project [Sat, 23 Nov 2013 01:41:41 +0000 (17:41 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)]
Merge commit '
afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a
Elliott Hughes [Fri, 22 Nov 2013 02:43:51 +0000 (18:43 -0800)]
am
f2f74ca6: Merge "Remove references to obsolete pmem functionality."
* commit '
f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
Remove references to obsolete pmem functionality.
Elliott Hughes [Thu, 21 Nov 2013 20:42:32 +0000 (20:42 +0000)]
Merge "Remove references to obsolete pmem functionality."
Elliott Hughes [Thu, 21 Nov 2013 20:22:39 +0000 (12:22 -0800)]
Remove references to obsolete pmem functionality.
Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea
Jesse Hall [Fri, 8 Nov 2013 20:58:20 +0000 (12:58 -0800)]
am
14e8b01a: Don\'t change the framebuffer target until we render a new one
* commit '
14e8b01a761180250671f3d6494532d8bd04fa8e':
Don't change the framebuffer target until we render a new one
Jesse Hall [Thu, 7 Nov 2013 20:28:26 +0000 (12:28 -0800)]
Don't change the framebuffer target until we render a new one
Continuing to send the last-rendered framebuffer to HWC on subsequent
frames allows the HWC to read partially-composed regions that haven't
changed, instead of re-composing from scratch.
Bug:
11573910
Change-Id: I8829877d2a06001f1e1b3f168cbba71c7b217b2d
Jesse Hall [Thu, 7 Nov 2013 04:48:51 +0000 (20:48 -0800)]
am
356c2386: Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
* commit '
356c23865d588659f1eea55bbe7e2b16b9cff08e':
Provide virtual display output buffer to HWC in prepare
Jesse Hall [Thu, 7 Nov 2013 04:43:19 +0000 (04:43 +0000)]
Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
Jesse Hall [Wed, 6 Nov 2013 15:38:36 +0000 (07:38 -0800)]
am
49318631: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev
* commit '
493186312a9a8c0215da0d6d3a9b0369491c0796':
Don't use implementation-defined format with CPU consumers
Jesse Hall [Wed, 6 Nov 2013 15:35:08 +0000 (15:35 +0000)]
Merge "Don't use implementation-defined format with CPU consumers" into klp-dev