OSDN Git Service
Jesse Hall [Wed, 20 Aug 2014 19:42:34 +0000 (19:42 +0000)]
Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
Jesse Hall [Thu, 14 Aug 2014 22:45:06 +0000 (15:45 -0700)]
surfaceflinger: skip composition for empty frames
By not committing the results of composition for empty frames, we
avoid spitting out series of black frames for virtual displays that
don't have visible layers. We still draw one black frame when going
from having layers to not having any. In particular, this avoids
having a series of empty frames due to re-compositing the primary
display in the period between creating the virtual display and adding
layers to it.
Bug:
16786752
Change-Id: I7e9b2ed2e407d8d49c7af736b447d4c6181b0ad8
Vinod Krishnan [Tue, 19 Aug 2014 18:40:36 +0000 (11:40 -0700)]
Adding an ECG hardware feature
Change-Id: I368772d4cd6b2713fb5180bedc91bf2b5bc015b4
Wengang Wu [Fri, 6 Jun 2014 21:32:15 +0000 (16:32 -0500)]
Enable support RGBX_8888 for omap3
Bug:
14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
Simon Wilson [Thu, 29 May 2014 15:49:51 +0000 (08:49 -0700)]
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Since the new TI SGX DDK 1.12 has fixed support for RGBA8888,
the workaround can be reverted. This may help with CTS issues.
Bug:
14995811
This reverts commit
6e79cb81d02984c9f7ac0586078f947c94c56c2a.
Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
Etienne Le Grand [Tue, 27 May 2014 18:02:49 +0000 (18:02 +0000)]
Merge "Add heart rate to ASensorEvent" into klp-modular-dev
Etienne Le Grand [Fri, 23 May 2014 00:15:08 +0000 (17:15 -0700)]
Add heart rate to ASensorEvent
Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
Aravind Akella [Thu, 22 May 2014 20:19:49 +0000 (13:19 -0700)]
Remove getRequiredPermission from NDK.
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
Ben Murdoch [Tue, 20 May 2014 09:31:58 +0000 (09:31 +0000)]
Merge "Add android.software.webview software feature." into klp-modular-dev
Ben Murdoch [Fri, 4 Apr 2014 12:06:43 +0000 (13:06 +0100)]
Add android.software.webview software feature.
Some devices may ship without a working WebView implementation. This
system feature will be present on devices that support a
functional WebView.
Bug:
13438487
Change-Id: I1f72756196661dca01614e124895522b60e52493
Vinod Krishnan [Fri, 16 May 2014 02:41:08 +0000 (02:41 +0000)]
Merge "Adding a portrait and landscape file" into klp-modular-dev
Vinod Krishnan [Thu, 15 May 2014 22:44:16 +0000 (15:44 -0700)]
Adding a portrait and landscape file
- Some wearable devices do not support landscape
- CTS tests were expecting some behavior which would not work since
it was not able to switch from portrait to landscape.
- Creating 2 files and then each of the devices will include that
particular feature that it supports.
Change-Id: If0e3151e23264a49f4964e1c643b33a90b78c114
Vinod Krishnan [Wed, 7 May 2014 05:01:37 +0000 (22:01 -0700)]
Adding Feature for HRM
Change-Id: Iaec58df9c27753ce2c39c6bbe3735f1894684cb5
Aravind Akella [Tue, 13 May 2014 00:14:56 +0000 (17:14 -0700)]
Set default values for FifoMaxEventCount and ReservedEventCount.
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
Andy McFadden [Fri, 9 May 2014 17:54:29 +0000 (17:54 +0000)]
Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
Andy McFadden [Thu, 8 May 2014 21:53:26 +0000 (14:53 -0700)]
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
Dumps the current DispSync state.
Bug
14651879
(this is a near-cherrypick of Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84)
Change-Id: I6e6c8452ede5c2d5098db1b884d28226e77d9a03
Eino-Ville Talvala [Thu, 8 May 2014 18:43:53 +0000 (11:43 -0700)]
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.
Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
Adam Lesinski [Thu, 1 May 2014 21:30:42 +0000 (21:30 +0000)]
Merge "Remove some features from wearables" into klp-modular-dev
Adam Lesinski [Wed, 23 Apr 2014 20:19:53 +0000 (13:19 -0700)]
Remove some features from wearables
It was incorrectly assumed that these devices must require
a device admin, camera, and network location.
Change-Id: I51942ece6c0b9f824bfc3ee82917a2496ae81788
Nick Vaccaro [Wed, 30 Apr 2014 18:19:23 +0000 (11:19 -0700)]
dumpstate: increase poll timeout waiting for SIGQUIT logging
Increased the maximum time dumpstate will wait for SIGQUIT process
to finish dumping its thread stacks to the logfile to 5 seconds.
Bug:
14057177
Change-Id: I0b43004512855d202f2fe0ea7b0e934e77a3a070
Dan Stoza [Wed, 5 Feb 2014 00:22:36 +0000 (16:22 -0800)]
Fix virtual display nesting
This fixes the cycling rendering loop caused by nesting virtual
displays by preventing them from recomposing if their contents
haven't changed.
(cherry-pick from master I600365c0fd5d3ad93e04295d26cf9de177ffc79b)
Bug:
12101046
Change-Id: I6182993d53537781aedb522f97a50f06eed8b80f
Aravind Akella [Fri, 11 Apr 2014 19:32:28 +0000 (19:32 +0000)]
Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
Aravind Akella [Mon, 7 Apr 2014 22:52:37 +0000 (22:52 +0000)]
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
This reverts commit
4369a4ebd5ae7567e7075bc82830b83178099ed5.
Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
Jeff Brown [Wed, 9 Apr 2014 02:55:38 +0000 (19:55 -0700)]
Remove unnecessary policy flags.
Bug:
13133142
Change-Id: Ib6c63ebad25d84f78623b4a46ccf83953d235fe7
Andy McFadden [Mon, 7 Apr 2014 16:46:37 +0000 (16:46 +0000)]
Merge "Always release a buffer" into klp-modular-dev
Etienne Le Grand [Sat, 5 Apr 2014 05:02:22 +0000 (05:02 +0000)]
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
This reverts commit
c57a019e117117c5a76c772970b26cd0f5db8c6a.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
Etienne Le Grand [Tue, 25 Mar 2014 04:28:23 +0000 (21:28 -0700)]
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
Andy McFadden [Fri, 4 Apr 2014 22:37:08 +0000 (15:37 -0700)]
Always release a buffer
In GLConsumer's updateAndReleaseLocked(), we must release either
the previously-acquired buffer or the newly-acquired buffer.
Bug
13755224
Change-Id: I96adc255400ed008ba6e6ac1725ab3514c7cc8ba
John Spurlock [Thu, 3 Apr 2014 20:39:17 +0000 (16:39 -0400)]
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
Bug:
13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
Jeff Tinker [Tue, 1 Apr 2014 21:54:35 +0000 (21:54 +0000)]
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
Jeff Tinker [Tue, 4 Mar 2014 21:23:56 +0000 (13:23 -0800)]
Support CAST V2 Authentication in MediaDrm
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2
related-to-bug:
12702350
Michael Wright [Fri, 28 Mar 2014 19:33:35 +0000 (19:33 +0000)]
Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
Xia Wang [Tue, 25 Mar 2014 03:46:32 +0000 (03:46 +0000)]
am
9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit '
9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
Build the benchmark test to /data/local/tmp/ for automated test
Michael Wright [Wed, 19 Mar 2014 19:06:10 +0000 (12:06 -0700)]
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
Bug:
11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
Xia Wang [Thu, 27 Feb 2014 02:04:50 +0000 (18:04 -0800)]
Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit
b7925f1364b56708e072884a5ae9dba2d32b58e6)
Marco Nelissen [Thu, 20 Mar 2014 20:57:13 +0000 (20:57 +0000)]
am
897fe45c: am
23c2fcbb: (-s ours) am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
897fe45cf7addc975fc7f9751c88ac53d9b9a778':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:48:45 +0000 (20:48 +0000)]
am
23c2fcbb: (-s ours) am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
23c2fcbbf4be87580e64132150aa554b764425c2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:26:08 +0000 (13:26 -0700)]
am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
c0af9cafba1217e2585777964730c70e40957dcd':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:13:23 +0000 (13:13 -0700)]
am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
b14d72bce04e990639305890b2aca3ccad5b3ebb':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 18:11:18 +0000 (11:11 -0700)]
am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
d070009ecdb9e8c58ce5d1540d5bcba5587a0448':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 18:06:54 +0000 (11:06 -0700)]
am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
df6774c9a3c1460554208925f38dde08953b6d0b':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:55:05 +0000 (10:55 -0700)]
am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
7c1cdbdd68c4f809dc5616654740ea98a275892d':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:48:35 +0000 (10:48 -0700)]
am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:33:12 +0000 (10:33 -0700)]
am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
1f70863d13668dc97047df15cce547ebc8435ff2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:04:42 +0000 (10:04 -0700)]
am
37b44969: Add support for writing byte arrays to parcels
* commit '
37b44969c0ca1d00e213da685dfbb2807f2bab30':
Add support for writing byte arrays to parcels
Kenny Root [Mon, 17 Mar 2014 21:28:34 +0000 (21:28 +0000)]
am
5b61ad2c: Check the padded size of the read byte array
* commit '
5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
Kenny Root [Mon, 17 Mar 2014 20:18:16 +0000 (13:18 -0700)]
Check the padded size of the read byte array
Bug:
13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
Adam Lesinski [Mon, 17 Mar 2014 19:50:56 +0000 (19:50 +0000)]
Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:50:30 +0000 (19:50 +0000)]
Merge "Remove accessibility as an optional feature" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:17:29 +0000 (12:17 -0700)]
Add device admin to wearables for API8 Compat
Bug:
13386441
Change-Id: I8814976db791bb1f2e60b6a9fc49afdd5f360414
Adam Lesinski [Mon, 17 Mar 2014 19:14:26 +0000 (12:14 -0700)]
Remove accessibility as an optional feature
Bug:
13439904
Change-Id: Icc6b84d05a24cbfdaa121929e7c7c77c0f7eed17
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Cherrypicked from
f0190bff38b6c29abbfc4a877442f71fc3d7dad8
https://googleplex-android-review.git.corp.google.com/#/c/433320/
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
Marco Nelissen [Fri, 14 Mar 2014 22:55:54 +0000 (22:55 +0000)]
am
f0190bff: Add support for writing byte arrays to parcels
* commit '
f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
RoboErik [Thu, 19 Dec 2013 19:54:29 +0000 (11:54 -0800)]
b/
12068020 add nonce to InputDeviceDescriptor. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/401795/
Adds a nonce field to allow generation of unique descriptors for
input devices.
Change-Id: Ie82bfb728bea95792b3b138dd3974f8b0aff63e0
Michael Wright [Sat, 19 Oct 2013 00:53:50 +0000 (17:53 -0700)]
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
Jeff Brown [Fri, 7 Mar 2014 21:57:59 +0000 (13:57 -0800)]
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Bug:
12938999
Change-Id: I544661b3887332998d703b7b2df9e56c23ab48c4
Aravind Akella [Thu, 6 Mar 2014 22:16:15 +0000 (22:16 +0000)]
am
19d64819: Bug fix for SensorFusion data rate.
* commit '
19d648195673b106152610e3787c95886946460f':
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
(cherry picked from commit
88509090387eeb400771a786171866710cca230c)
Aravind Akella [Thu, 6 Mar 2014 02:24:29 +0000 (02:24 +0000)]
am
ffac23b2: am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
ffac23b210a96e769fd79ae912b44a185e7d69bd':
Ignore flush complete events when recording last value for a sensor.
Aravind Akella [Thu, 6 Mar 2014 02:18:29 +0000 (02:18 +0000)]
am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
4b84704b97300eff3ebfab85652e64d54149d205':
Ignore flush complete events when recording last value for a sensor.
Aravind Akella [Tue, 4 Mar 2014 03:02:46 +0000 (19:02 -0800)]
Ignore flush complete events when recording last value for a sensor.
Bug:
11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
Michael Wright [Wed, 5 Mar 2014 00:51:43 +0000 (00:51 +0000)]
Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
Michael Wright [Fri, 18 Oct 2013 00:35:53 +0000 (17:35 -0700)]
Parse LED mappings in keylayout files. DO NOT MERGE
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
Simon Wilson [Fri, 28 Feb 2014 22:30:39 +0000 (14:30 -0800)]
Enable OMAP4 SGX workaround for OMAP3 too
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
Arve Hjønnevåg [Thu, 20 Feb 2014 00:04:44 +0000 (00:04 +0000)]
am
d06f6b00: am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
d06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Thu, 20 Feb 2014 00:00:49 +0000 (00:00 +0000)]
am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Wed, 19 Feb 2014 23:35:52 +0000 (15:35 -0800)]
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
Arve Hjønnevåg [Wed, 19 Feb 2014 21:47:35 +0000 (21:47 +0000)]
am
d437364e: am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
d437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:45:25 +0000 (21:45 +0000)]
am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
Andy McFadden [Thu, 30 Jan 2014 01:17:11 +0000 (17:17 -0800)]
Allow "opaque" flag to be updated. DO NOT MERGE
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug
12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
Arve Hjønnevåg [Fri, 14 Feb 2014 03:22:08 +0000 (19:22 -0800)]
Binder: Make sure binder objects do not overlap
Fixes crashing part of bug
11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
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
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
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
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
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