Dianne Hackborn
2e5c72d632
am 8657427f: am 7b076307: Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
...
* commit '8657427f78494df43d129d88f50e0d7375592486':
Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121
2011-03-11 10:51:11 -08:00
Dianne Hackborn
45ef700c20
am 1bada408: am 492eb33d: Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
...
* commit '1bada408f94253c31ae49b1b00ed6263ce0ff229':
Fix issue #4081756 : Crash when un-stopping applications
2011-03-11 10:51:04 -08:00
Dianne Hackborn
8d4fb33c6b
am 7b076307: Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
...
* commit '7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121
2011-03-11 10:44:46 -08:00
Dianne Hackborn
c9712bba26
am 492eb33d: Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
...
* commit '492eb33d549afa65e630d2f4886b1bdf3d979d04':
Fix issue #4081756 : Crash when un-stopping applications
2011-03-11 10:44:42 -08:00
Dianne Hackborn
1f8c98d091
Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
2011-03-11 10:39:46 -08:00
Dianne Hackborn
3a9c0a05bb
Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
2011-03-11 10:38:52 -08:00
Andreas Huber
6a7c4ecc6d
Merge "Only use ChromiumHTTPDataSource if webkit was built with chromium support."
2011-03-11 10:11:03 -08:00
Gilles Debunne
dd9e542e9e
Merge "Refactor in TextView's HandleViews."
2011-03-11 09:45:35 -08:00
David Li
1305ac5a4c
Merge "GLES2Debugger: Added DbgContext and vertex data capturing."
2011-03-11 09:45:35 -08:00
Glenn Kasten
6686201dae
am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
...
* commit '055066e1e77d944383360d50057f5b8187f23c0b':
Bug 3012968 DRM output control
2011-03-11 08:46:40 -08:00
Glenn Kasten
afada75e27
am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
...
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug 3012968 DRM output control
2011-03-11 08:44:35 -08:00
Glenn Kasten
2ee08a1694
Merge "Bug 3012968 DRM output control" into honeycomb-mr1
2011-03-11 08:43:05 -08:00
Mike Lockwood
6786cae1c4
am 4135cb8e: am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
...
* commit '4135cb8e43846e422bf760fd9b856c67cc4ec8f7':
Support for USB accessory URIs
2011-03-11 06:06:52 -08:00
Mike Lockwood
ef22134e3b
am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
...
* commit '364903bac6b9bfde694f1c0c5c40b6a2af628408':
Support for USB accessory URIs
2011-03-11 06:02:57 -08:00
Mike Lockwood
1fc8136de0
Merge "Support for USB accessory URIs" into honeycomb-mr1
2011-03-11 05:56:50 -08:00
Jim Miller
0d48d59988
am 7b7a8ca6: (-s ours) am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
...
* commit '7b7a8ca615723ea2a8075962775ef753918ea3f1':
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
2011-03-10 23:03:10 -08:00
Jim Miller
860a931587
am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
...
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
2011-03-10 23:01:42 -08:00
Jim Miller
21daa912d8
Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
2011-03-10 22:59:57 -08:00
Justin Ho
9c06fbbffe
am f5c2d350: am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
...
* commit 'f5c2d35059b482a2fc5e1284663648556c9a0596':
Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
2011-03-10 22:36:07 -08:00
Justin Ho
7129208ad9
am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
...
* commit 'f1093dfd7b15c7f33341a4062987c906c061d65f':
Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
2011-03-10 22:33:43 -08:00
Justin Ho
d295c2701c
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
2011-03-10 22:31:29 -08:00
Justin Ho
f6b04c0e0c
am cf99638b: am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
...
* commit 'cf99638b6b262197cdfb317582f5d8c93a94e649':
Wire up the data activity reporting on wifi icon in status bar.
2011-03-10 22:27:02 -08:00
Justin Ho
500608d2f7
am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
...
* commit '57162cdcdeaacc826011f98d0285c6034797f5f3':
Wire up the data activity reporting on wifi icon in status bar.
2011-03-10 22:24:51 -08:00
Justin Ho
bce08aed25
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
2011-03-10 22:22:57 -08:00
Adam Powell
8c55700874
am 2737dfe0: am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
...
* commit '2737dfe0a50379ae2524e95065b1b0afe222c83f':
Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
2011-03-10 21:46:17 -08:00
Justin Ho
9a17615b5c
am f333baa0: am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
...
* commit 'f333baa015407982ae76e63331b6d0c200c825c5':
Updated cellular data indicators with transmission signals Bug: #6699FF
2011-03-10 21:44:20 -08:00
Adam Powell
2672362aa3
am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
...
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
2011-03-10 21:43:45 -08:00
Justin Ho
8b6836f800
am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
...
* commit 'dacf0d022f1f78e60fffcd8b6b547743cca51c76':
Updated cellular data indicators with transmission signals Bug: #6699FF
2011-03-10 21:41:53 -08:00
Adam Powell
c59d880b61
Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
2011-03-10 21:40:38 -08:00
Justin Ho
23fc9022d7
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
2011-03-10 21:39:24 -08:00
Huahui Wu
2d2978ff05
am 372161b7: am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
...
* commit '372161b7555ccd8ba9ef9b63d5a01740ddda4308':
b/4080388 Improving the performance of ZoomManager
2011-03-10 21:29:26 -08:00
Huahui Wu
974b33351e
am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
...
* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
b/4080388 Improving the performance of ZoomManager
2011-03-10 21:27:24 -08:00
Huahui Wu
df328a2e04
Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
2011-03-10 21:25:47 -08:00
Ken Sumrall
eed9e31de4
am 9246e4ed: am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
...
* commit '9246e4edbab5f24dc06df34992493c64c50fd380':
Teach the framework to use the new android_reboot() function.
2011-03-10 19:29:52 -08:00
Ken Sumrall
06b72dc76e
am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
...
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
Teach the framework to use the new android_reboot() function.
2011-03-10 19:27:05 -08:00
Ken Sumrall
45d6471556
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
2011-03-10 19:24:42 -08:00
Jamie Gennis
0060c85ced
am 34bb677f: am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
...
* commit '34bb677f3fa7f3e476849df3c7873256a463f598':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
2011-03-10 18:10:24 -08:00
Jamie Gennis
da38c1f186
am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
...
* commit 'b2e606f5f175906ab8c578cb9ba03c728154c50c':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
2011-03-10 18:07:57 -08:00
Jamie Gennis
c2cc1b3f97
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
2011-03-10 18:06:32 -08:00
Mathias Agopian
497cfd70c2
am 92b56b8c: am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
...
* commit '92b56b8c5bd9a523f5d688c859bf5f74ac386b9e':
fix [4025681] continuous sensors should not try to send an event as soon as they're activated
2011-03-10 17:40:04 -08:00
Mathias Agopian
ca9cbe8fa2
am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
...
* commit 'e90c4998b514f738b3655e55b51a38119b8c5f23':
fix [4025681] continuous sensors should not try to send an event as soon as they're activated
2011-03-10 17:37:47 -08:00
Mathias Agopian
069160eba0
Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1
2011-03-10 17:36:15 -08:00
Teng-Hui Zhu
a820784590
am 37ee248b: am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
...
* commit '37ee248b526d3cdefbb0d401ec14b740b655896b':
Inline HTML5 Video support
2011-03-10 17:15:08 -08:00
Teng-Hui Zhu
7b45a5b73a
am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
...
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
Inline HTML5 Video support
2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
40ce089c12
Merge "Inline HTML5 Video support" into honeycomb-mr1
2011-03-10 17:10:29 -08:00
Adam Powell
fe428c671c
am 6615362b: am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
...
* commit '6615362b14131052c5055c0b17c3a2ade474a57d':
Fix bug 4080407 - Browser stuck after scrolling- page stops responding
2011-03-10 17:10:03 -08:00
Adam Powell
4bbbdba6b3
am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
...
* commit 'cf63b66cfd49dda473806a3b001db72fca48af5a':
Fix bug 4080407 - Browser stuck after scrolling- page stops responding
2011-03-10 17:07:52 -08:00
Adam Powell
672f2f2b66
Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
2011-03-10 17:06:11 -08:00
David Li
65948aa046
GLES2Debugger: Added DbgContext and vertex data capturing.
...
Send VBO related commands to client, which tracks the state.
Maintain index buffer content and vertex attrib pointer/buffer state on server.
During glDrawArrays/Elements, send user memory data to client.
Change-Id: Ia920e90479329b301ae4b5735e833eeb20293c94
Signed-off-by: David Li <davidxli@google.com>
2011-03-10 16:40:37 -08:00
Gloria Wang
492d475bbe
Merge "Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead."
2011-03-10 16:37:21 -08:00