OSDN Git Service
Mathias Agopian [Tue, 28 Aug 2012 01:47:35 +0000 (18:47 -0700)]
am
525705c8: Merge "Eradicate DisplayID." into jb-mr1-dev
* commit '
525705c88f91e46099970491282944d4ef0041d4':
Eradicate DisplayID.
Mathias Agopian [Tue, 28 Aug 2012 01:45:34 +0000 (18:45 -0700)]
Merge "Eradicate DisplayID." into jb-mr1-dev
Jeff Brown [Tue, 28 Aug 2012 01:06:09 +0000 (18:06 -0700)]
am
25e234f1: am
f456d32d: (-s ours) am
d7007cd4: Merge "Forward compatibility patch."
* commit '
25e234f11ae93b3c882694f0d7ec1d4526ed7526':
Forward compatibility patch.
Jeff Brown [Tue, 28 Aug 2012 01:03:45 +0000 (18:03 -0700)]
am
f456d32d: (-s ours) am
d7007cd4: Merge "Forward compatibility patch."
* commit '
f456d32d3c3aea966b5fba43e6d34f72df06c60d':
Forward compatibility patch.
Jeff Brown [Tue, 28 Aug 2012 00:57:26 +0000 (17:57 -0700)]
am
d7007cd4: Merge "Forward compatibility patch."
* commit '
d7007cd4bb2016a09ae8e8f746118f81fdd27f02':
Forward compatibility patch.
Mathias Agopian [Mon, 27 Aug 2012 23:28:24 +0000 (16:28 -0700)]
Eradicate DisplayID.
DisplayDevices are now keyed of the wp<IBinder> the client uses.
DisplayID has now become DisplayType which is just used to identify
physical displays (as opposed to virtual displays such as wifi displays).
Change-Id: I0c5968f2c902dcd699a7e0afacf833ff070c12ea
Jeff Brown [Tue, 28 Aug 2012 00:26:05 +0000 (17:26 -0700)]
Merge "Forward compatibility patch."
Jeff Brown [Tue, 28 Aug 2012 00:23:44 +0000 (17:23 -0700)]
am
a50b51c0: Compatibility work around for bad graphics driver dependency.
* commit '
a50b51c03aca449920fc8581a738032a7bce7150':
Compatibility work around for bad graphics driver dependency.
Jeff Brown [Tue, 28 Aug 2012 00:06:39 +0000 (17:06 -0700)]
Compatibility work around for bad graphics driver dependency.
This is a compatibility shim for one product whose drivers
are depending on SurfaceComposerClient::getDisplayInfo(
int, DisplayInfo*) when it really shouldn't.
Revert this patch when the problem has been resolved.
Bug:
7065398
Change-Id: I6542691b81fd1b1e1d79500a62e82d40a3d51db7
Jeff Brown [Tue, 28 Aug 2012 00:19:35 +0000 (17:19 -0700)]
am
1ae49e3f: Merge "Remove unused "layer" argument from show()." into jb-mr1-dev
* commit '
1ae49e3fef34ee38f8dfeb08b5914e3362af3b2f':
Remove unused "layer" argument from show().
Jeff Brown [Tue, 28 Aug 2012 00:19:34 +0000 (17:19 -0700)]
am
e310c394: Merge "Banish DisplayID from the SurfaceFlinger API." into jb-mr1-dev
* commit '
e310c3949f7de7183ef43e751526a5dc4cf0d74c':
Banish DisplayID from the SurfaceFlinger API.
Jeff Brown [Tue, 28 Aug 2012 00:17:08 +0000 (17:17 -0700)]
Merge "Remove unused "layer" argument from show()." into jb-mr1-dev
Jeff Brown [Tue, 28 Aug 2012 00:16:36 +0000 (17:16 -0700)]
Merge "Banish DisplayID from the SurfaceFlinger API." into jb-mr1-dev
Jeff Brown [Mon, 27 Aug 2012 23:12:46 +0000 (16:12 -0700)]
Forward compatibility patch.
Change-Id: I8e8af0c6035aaac5e5097f1cfb198250475627ee
Jeff Brown [Mon, 27 Aug 2012 05:49:35 +0000 (22:49 -0700)]
Remove unused "layer" argument from show().
Change-Id: I8944a9f4a27c330b11e5e837c69b88c8f84145ba
Jeff Brown [Sat, 25 Aug 2012 03:00:51 +0000 (20:00 -0700)]
Banish DisplayID from the SurfaceFlinger API.
Use only display tokens in the API to refer to new displays.
Don't require the caller to specify the display when creating
a surface (since in general a surface could be shown on
any display).
This is intended to be a minimum change just to update the API.
Note that SurfaceFlinger still uses DisplayID in a few places
internally that might cause some features not to work properly
when there are multiple displays (LayerScreenshot, for example).
Change-Id: I3d91eec2da406eefd97bcd53655d403ad865a7e6
Jean-Baptiste Queru [Mon, 27 Aug 2012 15:20:05 +0000 (08:20 -0700)]
am
f671385e: am
9801575a: am
908c8ff5: Merge "Fixed clang build error for libgui"
* commit '
f671385e71644b6f34a06f425aff8dd16ffc0105':
Fixed clang build error for libgui
Jean-Baptiste Queru [Mon, 27 Aug 2012 15:17:48 +0000 (08:17 -0700)]
am
9801575a: am
908c8ff5: Merge "Fixed clang build error for libgui"
* commit '
9801575a65f2f9d0bdc924ec0a4bbfb6ef071bbe':
Fixed clang build error for libgui
Jean-Baptiste Queru [Mon, 27 Aug 2012 15:15:12 +0000 (08:15 -0700)]
am
908c8ff5: Merge "Fixed clang build error for libgui"
* commit '
908c8ff55482b723eddec54c6308e54a136a3e49':
Fixed clang build error for libgui
Jean-Baptiste Queru [Mon, 27 Aug 2012 14:55:26 +0000 (07:55 -0700)]
Merge "Fixed clang build error for libgui"
The Android Open Source Project [Sat, 25 Aug 2012 14:16:24 +0000 (07:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I30ec4fc48ccc2a81fd0e5510514ba26a5d85840c
Mathias Agopian [Sat, 25 Aug 2012 00:24:54 +0000 (17:24 -0700)]
am
225c66a4: Revert "put back the unused virtuals in Vector<>"
* commit '
225c66a48cdc3acef21ee380dc134449749d3cb3':
Revert "put back the unused virtuals in Vector<>"
Mathias Agopian [Fri, 24 Aug 2012 23:55:29 +0000 (16:55 -0700)]
Revert "put back the unused virtuals in Vector<>"
This reverts commit
1648d4c13ba2eff3ea14cd87ee94028458a39f97.
Bug:
6977192
Change-Id: Idbb6b239aaed4fb1c054ce943f6ba06ede3492bb
Andy McFadden [Fri, 24 Aug 2012 21:18:11 +0000 (14:18 -0700)]
am
13a082e1: Added display initialization method
* commit '
13a082e160c2d1d8006b93a555a57035213d568b':
Added display initialization method
Andy McFadden [Fri, 24 Aug 2012 17:16:42 +0000 (10:16 -0700)]
Added display initialization method
The primary display device was being configured to "blank" by
default, which prevented the boot animation from appearing
(unless you got lucky with the hardware composer state).
Bug
6975688
Change-Id: I0fa52e9e719c6e997c5725a7baf15d9718461b78
Jamie Gennis [Fri, 24 Aug 2012 18:18:35 +0000 (11:18 -0700)]
am
0bceb847: surfaceflinger: fix display id selection
* commit '
0bceb84773882b796d9dacbaf96167cb15928d78':
surfaceflinger: fix display id selection
Jamie Gennis [Fri, 24 Aug 2012 18:13:34 +0000 (11:13 -0700)]
am
490aee0f: Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev
* commit '
490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc':
SurfaceTexture: inherit from ConsumerBase (try 2)
Jamie Gennis [Fri, 24 Aug 2012 03:19:38 +0000 (20:19 -0700)]
surfaceflinger: fix display id selection
This change fixes display ID selection so that it never chooses negative
numbers as display IDs.
Change-Id: I5af1acc7b1270b371595e096b18e2a6ad250c7ba
Jamie Gennis [Fri, 24 Aug 2012 18:11:06 +0000 (11:11 -0700)]
Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev
Andy McFadden [Fri, 24 Aug 2012 17:16:43 +0000 (10:16 -0700)]
am
9b6a395e: Revert "Added display initialization method"
* commit '
9b6a395e65ff88ab79fe92d6f112c434441ca606':
Revert "Added display initialization method"
Andy McFadden [Fri, 24 Aug 2012 17:12:22 +0000 (10:12 -0700)]
Revert "Added display initialization method"
Something doesn't seem right (again).
This reverts commit
53ade0853ca003c9e917b5e7d34e1b1338d7b87d.
Change-Id: Id5786997ca9dd2a447363e8ac95213ea37468504
Andy McFadden [Fri, 24 Aug 2012 16:31:42 +0000 (09:31 -0700)]
am
53ade085: Added display initialization method
* commit '
53ade0853ca003c9e917b5e7d34e1b1338d7b87d':
Added display initialization method
Andy McFadden [Fri, 24 Aug 2012 00:36:41 +0000 (17:36 -0700)]
Added display initialization method
The primary display device was being configured to "blank" by
default, which prevented the boot animation from appearing
(unless you got lucky with the hardware composer state).
Bug
6975688
(This reverts an earlier revert.)
Mathias Agopian [Fri, 24 Aug 2012 01:23:05 +0000 (18:23 -0700)]
am
f4358634: teach HWC about multiple displays
* commit '
f435863467ab407f2a482604beed5fa6f0144c62':
teach HWC about multiple displays
Mathias Agopian [Fri, 24 Aug 2012 01:23:05 +0000 (18:23 -0700)]
am
30bcc614: remove support for HWC < 1.0
* commit '
30bcc61431d8e3bef779472dd52a7b156dcaba09':
remove support for HWC < 1.0
Mathias Agopian [Fri, 24 Aug 2012 01:23:04 +0000 (18:23 -0700)]
am
e60b0687: HWComposer now has its own concept of display IDs
* commit '
e60b0687c8d49871d0c8786cabe6851f7a7783b5':
HWComposer now has its own concept of display IDs
Mathias Agopian [Thu, 23 Aug 2012 00:16:19 +0000 (17:16 -0700)]
teach HWC about multiple displays
Change-Id: I5e72a83d419a729835cb0e1ec45557b4d3fb56b1
Mathias Agopian [Wed, 22 Aug 2012 22:39:48 +0000 (15:39 -0700)]
remove support for HWC < 1.0
Change-Id: If7e676a6e3524afeb9af3875125d2131d95db38b
Mathias Agopian [Wed, 22 Aug 2012 06:34:09 +0000 (23:34 -0700)]
HWComposer now has its own concept of display IDs
HWComposer can now create IDs representing a display
it can deal with. IDs MAIN and HDMI are reserved.
SurfaceFlinger associate HWComposer IDs with a
DisplayDevice and uses that when it talks to HWComposer.
A DisplayDevice doesn't have to have a HWComposer ID,
in that case it just can't use h/w composer composition.
Change-Id: Iec3d7ac92e0c22bf975052ae2847402f58bade71
Mathias Agopian [Thu, 23 Aug 2012 22:28:11 +0000 (15:28 -0700)]
am
7c9e8263: Merge "simplify further vsync handling" into jb-mr1-dev
* commit '
7c9e82633c5c4f85b896a5879bdb25cdf659646e':
simplify further vsync handling
Mathias Agopian [Thu, 23 Aug 2012 22:27:09 +0000 (15:27 -0700)]
Merge "simplify further vsync handling" into jb-mr1-dev
Mathias Agopian [Tue, 21 Aug 2012 22:47:28 +0000 (15:47 -0700)]
simplify further vsync handling
- we now clean-up "dead" connection in the main loop,
this entirely avoid the problem with the side effects of
releasing strong references. We now only hold on to strong
reference for the connection we will signal.
- also simplify how we build the list of "ready" connections, by
only adding them to the list when we did receive a vsync event
Change-Id: I2a84da431320a2af8e8a93e07622a1d258236f43
Tareq A. Siraj [Thu, 26 Jul 2012 20:04:24 +0000 (16:04 -0400)]
Fixed clang build error for libgui
Fixed the order of the statements in ANDROID_SINGLETON_STATIC_INSTANCE
macro so that the templated static member variable initialization
comes before the instantiation of the Singleton class. This
fixes the clang compile error.
Change-Id: Ic47d17e152b657f2dff3191ccc3770753fdf002b
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
Jesse Hall [Thu, 23 Aug 2012 16:16:49 +0000 (09:16 -0700)]
am
d12780ed: Merge "Update for cleanups in hwc interface" into jb-mr1-dev
* commit '
d12780ed123b54687fea534b34f54ef9c678cdcd':
Update for cleanups in hwc interface
Jesse Hall [Thu, 23 Aug 2012 16:15:53 +0000 (09:15 -0700)]
Merge "Update for cleanups in hwc interface" into jb-mr1-dev
The Android Automerger [Thu, 23 Aug 2012 13:33:50 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Wed, 22 Aug 2012 22:35:30 +0000 (15:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ida7b9f23f8deb451a9e6e9f2714d7a677fb6ca1c
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:23:50 +0000 (14:23 -0700)]
Revert "Added display initialization method"
This reverts commit
3f3956236aac97b6aa25fa89f0983d5e9d065fdb
Change-Id: Ia2a15d9a5db88add6019edf9d955cef1f73d432d
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:27:52 +0000 (14:27 -0700)]
am
bc46e0ad: Merge "Revert "Added display initialization method"" into jb-mr1-dev
* commit '
bc46e0ad869befcfa97f6272615cdeae2135008f':
Revert "Added display initialization method"
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:25:48 +0000 (14:25 -0700)]
Merge "Revert "Added display initialization method"" into jb-mr1-dev
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:23:50 +0000 (14:23 -0700)]
Revert "Added display initialization method"
This reverts commit
3f3956236aac97b6aa25fa89f0983d5e9d065fdb
Change-Id: Ia2a15d9a5db88add6019edf9d955cef1f73d432d
Jesse Hall [Wed, 22 Aug 2012 21:19:12 +0000 (14:19 -0700)]
am
8f971ff6: Pass the correct number of displays based on HWC version
* commit '
8f971ff6661c875e7adb3f14731e1579c3c80c62':
Pass the correct number of displays based on HWC version
Jesse Hall [Tue, 21 Aug 2012 19:05:09 +0000 (12:05 -0700)]
Update for cleanups in hwc interface
Change-Id: I363fd8b085167a1af6c14b68012bda5c62bfe59f
Jesse Hall [Wed, 22 Aug 2012 18:50:00 +0000 (11:50 -0700)]
Pass the correct number of displays based on HWC version
Change-Id: I27372f5d3102ad56f6d67722d631ae18d37f8330
The Android Automerger [Wed, 22 Aug 2012 13:33:48 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Wed, 22 Aug 2012 02:11:06 +0000 (19:11 -0700)]
am
9f54ac38: ui/Fence: change the TIMEOUT_NEVER value to -1
* commit '
9f54ac38860761ef62d9bb8282d54ff51a1a68a3':
ui/Fence: change the TIMEOUT_NEVER value to -1
Jamie Gennis [Wed, 22 Aug 2012 00:03:18 +0000 (17:03 -0700)]
ui/Fence: change the TIMEOUT_NEVER value to -1
Change-Id: I3ef0a4c06f80990b53a8bf2eda6edbfcbefd0f34
Eino-Ville Talvala [Tue, 21 Aug 2012 23:48:11 +0000 (16:48 -0700)]
am
04930445: Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev
* commit '
04930445031c5f41707806182bb7a152e64ddede':
Add BufferItemConsumer, a simple BufferQueue consumer.
Eino-Ville Talvala [Tue, 21 Aug 2012 23:46:05 +0000 (16:46 -0700)]
Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev
Jamie Gennis [Wed, 8 Aug 2012 01:03:04 +0000 (18:03 -0700)]
SurfaceTexture: inherit from ConsumerBase (try 2)
This change makes SurfaceTexture inherit from ConsumerBase. It removes all of
the functionality from SurfaceTexture that is now provided by the base class.
This includes fixes for two bugs that were found after checking this change in
the first time and then reverting it.
Change-Id: Ie2d9f4f27cfef26fdac341de3152e842b01a58d2
The Android Open Source Project [Tue, 21 Aug 2012 23:05:59 +0000 (16:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb96902f4272f83b3ebc1081ace5d2511d4281b7
Andy McFadden [Tue, 21 Aug 2012 23:00:32 +0000 (16:00 -0700)]
am
3f395623: Added display initialization method
* commit '
3f3956236aac97b6aa25fa89f0983d5e9d065fdb':
Added display initialization method
Eino-Ville Talvala [Tue, 21 Aug 2012 20:37:35 +0000 (13:37 -0700)]
Add BufferItemConsumer, a simple BufferQueue consumer.
BufferItemConsumer allows for acquiring BufferQueue's BufferItems,
which contain all the data and metadata the BufferQueue has for a
given graphics buffer.
This consumer is useful when direct access to the native buffer_handles
is needed by the client.
Also includes a minor cleanup of CpuConsumer's use of 'virtual'.
Bug:
6243944
Change-Id: If7dc4192b15ac499555f1eda42a85140f2434795
Andy McFadden [Mon, 20 Aug 2012 22:39:23 +0000 (15:39 -0700)]
Added display initialization method
The primary display device was being configured to "blank" by
default, which prevented the boot animation from appearing
(unless you got lucky with the hardware composer state).
Bug
6975688
Change-Id: Idaa0d0b98ebb331a17d1b16774c6b05bfa1e8728
Mathias Agopian [Tue, 21 Aug 2012 03:07:34 +0000 (20:07 -0700)]
fix various issues in SF's EventThread
- one issues caused most timestamps to be reported as 0
- on rare occasions an uninitialized variable could be used
- vsync counts per connection were accessed unthreadsafely
we now have 2 lists of connections in the main loop, one just
keeps a list of strong refs to the connections because once
we have a strong ref we're not allowed to release it while
holding the lock.
the 2nd list holds the connections that have a vsync event to
be reported. all the calculations are made with the lock held.
Change-Id: Iacfad3745b05df79d9ece3719bd4c34ddbfd5b83
Mathias Agopian [Tue, 21 Aug 2012 19:09:42 +0000 (12:09 -0700)]
am
a4cb35a2: fix various issues in SF\'s EventThread
* commit '
a4cb35a2864d58e9a764a17623e15ab25a9964a0':
fix various issues in SF's EventThread
The Android Automerger [Tue, 21 Aug 2012 13:34:25 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 21 Aug 2012 03:07:34 +0000 (20:07 -0700)]
fix various issues in SF's EventThread
- one issues caused most timestamps to be reported as 0
- on rare occasions an uninitialized variable could be used
- vsync counts per connection were accessed unthreadsafely
we now have 2 lists of connections in the main loop, one just
keeps a list of strong refs to the connections because once
we have a strong ref we're not allowed to release it while
holding the lock.
the 2nd list holds the connections that have a vsync event to
be reported. all the calculations are made with the lock held.
Change-Id: Iacfad3745b05df79d9ece3719bd4c34ddbfd5b83
Mathias Agopian [Tue, 21 Aug 2012 04:27:55 +0000 (21:27 -0700)]
am
1648d4c1: put back the unused virtuals in Vector<>
* commit '
1648d4c13ba2eff3ea14cd87ee94028458a39f97':
put back the unused virtuals in Vector<>
Mathias Agopian [Tue, 21 Aug 2012 00:03:29 +0000 (17:03 -0700)]
put back the unused virtuals in Vector<>
some binaries are using these private APIs and broke
(as they should!) with this change. Temporarily restore the
virtuals to work around this.
Bug:
6977550
Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
Mathias Agopian [Mon, 20 Aug 2012 23:49:41 +0000 (16:49 -0700)]
am
317357fd: Merge "get rid of mirrorItemAt() which isn\'t used anywhere" into jb-mr1-dev
* commit '
317357fdf7a2b542dfdaa06f42ff7f5f0153f9a3':
get rid of mirrorItemAt() which isn't used anywhere
Mathias Agopian [Mon, 20 Aug 2012 23:48:07 +0000 (16:48 -0700)]
Merge "get rid of mirrorItemAt() which isn't used anywhere" into jb-mr1-dev
Eino-Ville Talvala [Mon, 20 Aug 2012 23:19:53 +0000 (16:19 -0700)]
am
84a9a3c0: Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
* commit '
84a9a3c0ec35915d3cc40e9e889d4032e189894a':
CpuConsumer: inherit from ConsumerBase
Eino-Ville Talvala [Mon, 20 Aug 2012 23:18:10 +0000 (16:18 -0700)]
Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
Eino-Ville Talvala [Mon, 20 Aug 2012 22:44:40 +0000 (15:44 -0700)]
CpuConsumer: inherit from ConsumerBase
Change-Id: I55178b1d673ffa0fbc6e63ef47642c64d4d03228
Mathias Agopian [Mon, 20 Aug 2012 21:21:29 +0000 (14:21 -0700)]
get rid of mirrorItemAt() which isn't used anywhere
Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
Jamie Gennis [Mon, 20 Aug 2012 21:28:53 +0000 (14:28 -0700)]
Revert "SurfaceTexture: inherit from ConsumerBase"
This reverts commit
ed059a8d754770c3cf28b78dba30f7a6ba475dbe
Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
Jamie Gennis [Mon, 20 Aug 2012 21:35:21 +0000 (14:35 -0700)]
am
729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
* commit '
729f48082e2c7660e94830e52006f7af4efb747a':
Revert "SurfaceTexture: inherit from ConsumerBase"
Jamie Gennis [Mon, 20 Aug 2012 21:35:20 +0000 (14:35 -0700)]
am
f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
* commit '
f7f6345068fe0644bf296b88a687b361eae0cc98':
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
Jamie Gennis [Mon, 20 Aug 2012 21:33:23 +0000 (14:33 -0700)]
Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 21:33:15 +0000 (14:33 -0700)]
Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 21:28:53 +0000 (14:28 -0700)]
Revert "SurfaceTexture: inherit from ConsumerBase"
This reverts commit
ed059a8d754770c3cf28b78dba30f7a6ba475dbe
Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
Jamie Gennis [Mon, 20 Aug 2012 21:28:21 +0000 (14:28 -0700)]
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
This reverts commit
f8d33c652b930abbfb0722f3a2928cbc2ea71078
Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511
Mathias Agopian [Mon, 20 Aug 2012 21:22:28 +0000 (14:22 -0700)]
am
b3d68efa: Merge "Fix deadlock in SF." into jb-mr1-dev
* commit '
b3d68efa7e807070ed63cfad3f7576055c58eeba':
Fix deadlock in SF.
Mathias Agopian [Mon, 20 Aug 2012 21:20:17 +0000 (14:20 -0700)]
Merge "Fix deadlock in SF." into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 19:40:53 +0000 (12:40 -0700)]
am
220ef10c: Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
* commit '
220ef10c5fe44df0ff3898de06028975995a34e4':
SurfaceTexture: call ConsumerBase::freeBufferLocked
Jamie Gennis [Mon, 20 Aug 2012 19:39:37 +0000 (12:39 -0700)]
Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 18:30:44 +0000 (11:30 -0700)]
SurfaceTexture: call ConsumerBase::freeBufferLocked
This change fixes SurfaceTexture::freeBufferLocked so that it calls the base
class implementation.
Change-Id: I45d76fb2eb02c1fa6e4e917823ead83e2086bd15
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:25:39 +0000 (10:25 -0700)]
am
d3bbcaff: resolved conflicts for merge of
21938749 to jb-mr1-dev
* commit '
d3bbcaff6f0e08db0412d92f42562a2826a58bec':
Fix error trap in SurfaceTexture Client
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:22:33 +0000 (10:22 -0700)]
resolved conflicts for merge of
21938749 to jb-mr1-dev
Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:44:44 +0000 (09:44 -0700)]
am
0adc8f26: am
6e820eec: am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
0adc8f260023ec25c31ff4ceadde047528cb64ab':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:42:32 +0000 (09:42 -0700)]
am
6e820eec: am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
6e820eec21917f8e25c40dbc8b972468535af0e8':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:11 +0000 (09:40 -0700)]
am
349149b5: Merge "Fix error trap in SurfaceTexture Client"
* commit '
349149b52a424c212e33d165bc146bc0337ea4c4':
Fix error trap in SurfaceTexture Client
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:11 +0000 (09:40 -0700)]
am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
6f89ebded650406818b5fc5e9eaf096a06a2798c':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:55:04 +0000 (08:55 -0700)]
Merge "Fix error trap in SurfaceTexture Client"
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:54:42 +0000 (08:54 -0700)]
Merge "EGL: do not use sparse files for shader"
The Android Automerger [Mon, 20 Aug 2012 13:34:51 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Fri, 17 Aug 2012 22:06:02 +0000 (15:06 -0700)]
Fix deadlock in SF.
problem was that we were acquiring a strong reference
on Connection object with a lock held, when those
got out of scope (lock still held) their dtor
could be called if all other refs had dropped,
the dtor would acquire the lock again to
remove the Connection from the main list. boom.
we rearange the code so this doesn't happen.
Bug:
6942208
Change-Id: I0a0ebabce2842d29d60d645b64aac2f26640e59b
Jamie Gennis [Fri, 17 Aug 2012 22:37:56 +0000 (15:37 -0700)]
am
2c7eb92b: Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
* commit '
2c7eb92b6394427bfe81962668d46194959bc722':
SurfaceTexture: inherit from ConsumerBase
Jamie Gennis [Fri, 17 Aug 2012 22:35:17 +0000 (15:35 -0700)]
Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev