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
Nick Pelly
37ee500094
am 367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).
...
* commit '367f41f8f61126c2ab34a34cc676756a9fc23ac2':
Implement new NFC-EE API's as shared library (frameworks/base).
2011-03-10 16:32:28 -08:00
Jamie Gennis
7a4d0dfd43
SurfaceFlinger: Respect the PROTECTED gralloc bit.
...
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.
Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug: 4081304
2011-03-10 16:25:48 -08:00
Scott Main
84ca8531df
am b9027e69: am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'b9027e69471a5dd2398b58d369c079c80d70f4b6':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 16:01:52 -08:00
Scott Main
3b51440fd0
am a810d02c: am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit 'a810d02ce075893fd0f81dbd2fd97089365efd68':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 16:01:49 -08:00
Xia Wang
57628043d4
am 05ab5caa: am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
...
* commit '05ab5caa80fdea6bba8ec2fa758be8e9c7ad4b3d':
Add WifiStressTest to Wi-Fi only test suite.
2011-03-10 16:01:45 -08:00
Scott Main
3c041ed2ff
am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'dc8b70cabc23316e349aaf2fe03bcc830dd66e6c':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:57:38 -08:00
Scott Main
229042cb48
am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit 'dd7617b3276c0a666c17ae2fb3ab02d5dce4b354':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:57:34 -08:00
Xia Wang
af268fff07
am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
...
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
Add WifiStressTest to Wi-Fi only test suite.
2011-03-10 15:57:27 -08:00
Scott Main
3b4f8b2ca5
am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:40:32 -08:00
Scott Main
0b01fccb6d
am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit '0722cec0f1e921a1d12d3c0dbb8b135d309b2031':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:40:23 -08:00
Xia Wang
416132888b
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
2011-03-10 15:29:12 -08:00
Scott Main
e3fd9b8044
Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
2011-03-10 15:17:42 -08:00
Rajneesh Chowdury
be2d91b8f7
am a4865ec7: am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
...
* commit 'a4865ec73f9faccd6dc442cbc6d78666b1a69b28':
Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:14:27 -08:00
Scott Main
ffb7903b47
Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
2011-03-10 15:13:49 -08:00
Rajneesh Chowdury
ba0f2a3467
am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
...
* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:12:34 -08:00