OSDN Git Service
Ramanan Rajeswaran [Wed, 22 Aug 2012 21:30:04 +0000 (14:30 -0700)]
am
519b3e4a: am
bc46e0ad: Merge "Revert "Added display initialization method"" into jb-mr1-dev
* commit '
519b3e4a3b78f63597ab4de4d92d1780fdcad9bd':
Revert "Added display initialization method"
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:21:31 +0000 (14:21 -0700)]
am
c4f4e7f9: am
8f971ff6: Pass the correct number of displays based on HWC version
* commit '
c4f4e7f968c15bae04364e052d649305c1f9941c':
Pass the correct number of displays based on HWC version
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 [Wed, 22 Aug 2012 18:50:00 +0000 (11:50 -0700)]
Pass the correct number of displays based on HWC version
Change-Id: I27372f5d3102ad56f6d67722d631ae18d37f8330
Jamie Gennis [Wed, 22 Aug 2012 02:14:12 +0000 (19:14 -0700)]
am
97799fbb: am
9f54ac38: ui/Fence: change the TIMEOUT_NEVER value to -1
* commit '
97799fbb2d1ac18566d7b25239165ed14de55d98':
ui/Fence: change the TIMEOUT_NEVER value to -1
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:49:57 +0000 (16:49 -0700)]
am
898b4f88: am
04930445: Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev
* commit '
898b4f88a18e9bcc41ce08c011f1b7dc1e57a3c1':
Add BufferItemConsumer, a simple BufferQueue consumer.
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
The Android Open Source Project [Tue, 21 Aug 2012 23:09:48 +0000 (16:09 -0700)]
am
ee8445a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ee8445a4de6a3a1d8eb3e4e9b0aadc582e121a9a':
fix various issues in SF's EventThread
Revert "SurfaceTexture: inherit from ConsumerBase"
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:01:51 +0000 (16:01 -0700)]
am
30b84c7d: am
3f395623: Added display initialization method
* commit '
30b84c7d035c51a02238fd6163679876552863e6':
Added display initialization method
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:10:35 +0000 (12:10 -0700)]
am
a2f58b17: am
a4cb35a2: fix various issues in SF\'s EventThread
* commit '
a2f58b17057b25eb3564505509a62a1d687c4306':
fix various issues in SF's EventThread
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:29:41 +0000 (21:29 -0700)]
am
9cf3b93b: am
1648d4c1: put back the unused virtuals in Vector<>
* commit '
9cf3b93bc73d787d21d88b4295fd902dcc7cae23':
put back the unused virtuals in Vector<>
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:51:16 +0000 (16:51 -0700)]
am
186e2bd0: am
317357fd: Merge "get rid of mirrorItemAt() which isn\'t used anywhere" into jb-mr1-dev
* commit '
186e2bd064336c75bf2fc6681ec294a85113fd38':
get rid of mirrorItemAt() which isn't used anywhere
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:21:28 +0000 (16:21 -0700)]
am
cd3028dc: am
84a9a3c0: Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
* commit '
cd3028dc0b943584ae16b624e79551c60cf27dd7':
CpuConsumer: inherit from ConsumerBase
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:37:03 +0000 (14:37 -0700)]
am
3eb49879: am
729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
* commit '
3eb49879918a54f090ec9252d7d3072dd4d31e94':
Revert "SurfaceTexture: inherit from ConsumerBase"
Jamie Gennis [Mon, 20 Aug 2012 21:37:02 +0000 (14:37 -0700)]
am
9e08ee74: am
f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
* commit '
9e08ee7493133e94ddd6c616e3ae36ec96a5e855':
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
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:23:55 +0000 (14:23 -0700)]
am
a2613877: am
b3d68efa: Merge "Fix deadlock in SF." into jb-mr1-dev
* commit '
a2613877fc9420acd2aadccfed9b4d4b6615fc98':
Fix deadlock in SF.
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:43:17 +0000 (12:43 -0700)]
am
823b33c7: am
220ef10c: Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
* commit '
823b33c7e10681c3d52383af45fad52dcc99b69d':
SurfaceTexture: call ConsumerBase::freeBufferLocked
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:26:55 +0000 (10:26 -0700)]
am
d42a32ee: am
d3bbcaff: resolved conflicts for merge of
21938749 to jb-mr1-dev
* commit '
d42a32ee01dab32047502bbbaf0465f4f0f3f6be':
Fix error trap in SurfaceTexture Client
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:47:25 +0000 (09:47 -0700)]
am
ada50888: am
0adc8f26: am
6e820eec: am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
ada508884284f9cd2025f683dd4ac4c66a1ffc08':
EGL: do not use sparse files for shader
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:39:57 +0000 (15:39 -0700)]
am
245bf9b4: am
2c7eb92b: Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
* commit '
245bf9b498ce56df66424b6df3c0b1fdb9784e4c':
SurfaceTexture: inherit from ConsumerBase
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
Mathias Agopian [Fri, 17 Aug 2012 05:35:00 +0000 (22:35 -0700)]
am
391f32ba: am
cd60f99a: refactor compositing code to avoid multiple eglMakeCurrent() calls
* commit '
391f32ba783db676b716ddb60ee693b273b1d1ef':
refactor compositing code to avoid multiple eglMakeCurrent() calls
Mathias Agopian [Fri, 17 Aug 2012 05:35:00 +0000 (22:35 -0700)]
am
081732f4: am
5f20e2d4: reimplement wifi display hack with new external display SF framework
* commit '
081732f43c77cfa8c45620a95fdeb8add38cc7f3':
reimplement wifi display hack with new external display SF framework
Mathias Agopian [Fri, 17 Aug 2012 05:33:30 +0000 (22:33 -0700)]
am
cd60f99a: refactor compositing code to avoid multiple eglMakeCurrent() calls
* commit '
cd60f99aba9e750700a967db30b74a29145739cf':
refactor compositing code to avoid multiple eglMakeCurrent() calls
Mathias Agopian [Fri, 17 Aug 2012 05:33:30 +0000 (22:33 -0700)]
am
5f20e2d4: reimplement wifi display hack with new external display SF framework
* commit '
5f20e2d4462da3471f59152b32cd8640fa4a21da':
reimplement wifi display hack with new external display SF framework
Mathias Agopian [Fri, 17 Aug 2012 04:03:06 +0000 (21:03 -0700)]
am
a631fb0a: am
818b4605: display states can\'t share the dirty flags
* commit '
a631fb0aae852c1b1899bac9cfad8466a48165f5':
display states can't share the dirty flags
Mathias Agopian [Fri, 17 Aug 2012 04:03:05 +0000 (21:03 -0700)]
am
ed500b34: am
111b2d89: binder interfaces can\'t be compared directly
* commit '
ed500b3467f8c113622d6f365c258b282fa48fd8':
binder interfaces can't be compared directly
Mathias Agopian [Fri, 17 Aug 2012 04:01:27 +0000 (21:01 -0700)]
am
818b4605: display states can\'t share the dirty flags
* commit '
818b46058aa3006e1d3c178abd36d4f10823f5d9':
display states can't share the dirty flags
Mathias Agopian [Fri, 17 Aug 2012 04:01:26 +0000 (21:01 -0700)]
am
111b2d89: binder interfaces can\'t be compared directly
* commit '
111b2d89221722d38f5b5b3ba65904ec22421839':
binder interfaces can't be compared directly
Mathias Agopian [Thu, 16 Aug 2012 23:28:27 +0000 (16:28 -0700)]
refactor compositing code to avoid multiple eglMakeCurrent() calls
when multiple displays are connected, we ended-up having to
call eglMakeCurrent() twice per display due to a limitation
in EGL. this fixes that.
Change-Id: I11e4584df50f8c24bbecee74e37b28b3ee031d2f
Mathias Agopian [Sat, 11 Aug 2012 01:50:38 +0000 (18:50 -0700)]
reimplement wifi display hack with new external display SF framework
fix a few bugs with external displays
- HWComposer doesn't really handle multiple displays yet
so there is a lot of ugliness there
- We also need to make sure that external displays are not
blanked by default
- due to some EGL limitations surfaces being swapped need
to be current
Change-Id: I82bff05b43bcebd8da863c7c76b4edbc3bc223a9
Mathias Agopian [Fri, 17 Aug 2012 03:57:39 +0000 (20:57 -0700)]
display states can't share the dirty flags
Change-Id: Ifade9f2f1a0df9a36aede77a6cf5eee4be534f98
Mathias Agopian [Fri, 17 Aug 2012 03:52:17 +0000 (20:52 -0700)]
binder interfaces can't be compared directly
we always need to compare their binder
Change-Id: I70d554ebc5009fe81e87923235f91451f32e1a30
The Android Open Source Project [Fri, 17 Aug 2012 02:12:59 +0000 (19:12 -0700)]
am
69543c7c: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
69543c7ce529a475e9d14d218916fa25657bf7f3':
we were mistakenly optimizing out SF's main transactions in some cases
The Android Open Source Project [Fri, 17 Aug 2012 02:10:39 +0000 (19:10 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2f5150a2972fd8cc92ed4c38c975a8ac73283879
Jamie Gennis [Wed, 8 Aug 2012 01:03:04 +0000 (18:03 -0700)]
SurfaceTexture: inherit from ConsumerBase
This change makes SurfaceTexture inherit from ConsumerBase. It removes all of
the functionality from SurfaceTexture that is now provided by the base class.
Change-Id: I4a881df42810a14ee32d4ef7c8772a8f2510f4c7
Siva Velusamy [Thu, 16 Aug 2012 23:31:31 +0000 (16:31 -0700)]
am
0bbd95b9: am
c21fc05a: Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
* commit '
0bbd95b9beece22fe7f833e6def244e39536a95e':
gltrace: flush trace buffer on createContext & makeCurrent
Siva Velusamy [Thu, 16 Aug 2012 23:29:05 +0000 (16:29 -0700)]
am
c21fc05a: Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
* commit '
c21fc05af75ee746e29f48b6d231127ee000f7ed':
gltrace: flush trace buffer on createContext & makeCurrent
Siva Velusamy [Thu, 16 Aug 2012 23:26:59 +0000 (16:26 -0700)]
Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
Siva Velusamy [Thu, 16 Aug 2012 21:41:20 +0000 (14:41 -0700)]
gltrace: flush trace buffer on createContext & makeCurrent
Certain apps (e.g. chrome) seem to create contexts which are unused
for long periods of time. If tracing is stopped before those contexts
are used, then the debugger never gets to know that these contexts
were created. Flushing the trace after these calls ensures that
the debugger knows about all created/used contexts.
Change-Id: I01baa11aa56ac89eddce3c2851e4bf01076984d1
The Android Automerger [Thu, 16 Aug 2012 13:33:59 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 15 Aug 2012 20:46:03 +0000 (13:46 -0700)]
we were mistakenly optimizing out SF's main transactions in some cases
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for
6970310
Bug:
6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
Mathias Agopian [Wed, 15 Aug 2012 23:18:21 +0000 (16:18 -0700)]
am
64af43a2: am
13233e06: oopsie, missed a spot when fixing b/
6970310
* commit '
64af43a229c4c4f1bf8a1b323b2985b7469e21ec':
oopsie, missed a spot when fixing b/
6970310
Mathias Agopian [Wed, 15 Aug 2012 23:16:44 +0000 (16:16 -0700)]
am
13233e06: oopsie, missed a spot when fixing b/
6970310
* commit '
13233e067b8f71adc3a0ade5f442265e1f27084b':
oopsie, missed a spot when fixing b/
6970310
Mathias Agopian [Wed, 15 Aug 2012 23:14:33 +0000 (16:14 -0700)]
oopsie, missed a spot when fixing b/
6970310
Change-Id: Ia320fddc7cc4b0666a4fee678af710ecf5f83ff5
Mathias Agopian [Wed, 15 Aug 2012 20:51:51 +0000 (13:51 -0700)]
am
c94805ba: am
3559b07a: we were mistakenly optimizing out SF\'s main transactions in some cases
* commit '
c94805ba3336f6085111803e9c73df795b75217c':
we were mistakenly optimizing out SF's main transactions in some cases
Mathias Agopian [Wed, 15 Aug 2012 20:50:23 +0000 (13:50 -0700)]
am
3559b07a: we were mistakenly optimizing out SF\'s main transactions in some cases
* commit '
3559b07a885bcdff51a6dffb8e3a5ac5adf3a220':
we were mistakenly optimizing out SF's main transactions in some cases
Mathias Agopian [Wed, 15 Aug 2012 20:46:03 +0000 (13:46 -0700)]
we were mistakenly optimizing out SF's main transactions in some cases
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for
6970310
Bug:
6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
Jeff Brown [Wed, 15 Aug 2012 17:30:48 +0000 (10:30 -0700)]
am
8b580f54: am
ac1f70bb: Use new PowerManager API.
* commit '
8b580f54ed27533318c60a5b6836ee6d61b35bb3':
Use new PowerManager API.
Jeff Brown [Wed, 15 Aug 2012 17:28:08 +0000 (10:28 -0700)]
am
ac1f70bb: Use new PowerManager API.
* commit '
ac1f70bb7135cd5fe73d6fbf121a62c779679c5a':
Use new PowerManager API.
Jeff Brown [Wed, 15 Aug 2012 17:02:40 +0000 (10:02 -0700)]
am
65b24936: am
01eb9792: Fix layer removal transaction.
* commit '
65b24936754b5bccc205b3566de95598e4d99bdd':
Fix layer removal transaction.
Jeff Brown [Wed, 15 Aug 2012 17:00:59 +0000 (10:00 -0700)]
am
01eb9792: Fix layer removal transaction.
* commit '
01eb979243a57bd33f8389aeeade8024dd0258c0':
Fix layer removal transaction.
The Android Open Source Project [Wed, 15 Aug 2012 15:29:20 +0000 (08:29 -0700)]
am
1b488abc: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1b488abc8e4547e4b553b50320c58d52dea8fe8a':
The Android Open Source Project [Wed, 15 Aug 2012 15:27:33 +0000 (08:27 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I444e336418583d709973a26579a4f1027ca4abfa
The Android Automerger [Wed, 15 Aug 2012 13:34:21 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev