OSDN Git Service
Robert Greenwalt [Fri, 11 Mar 2011 22:16:18 +0000 (14:16 -0800)]
Merge "resolved conflicts for merge of
55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Robert Greenwalt [Fri, 11 Mar 2011 22:05:14 +0000 (14:05 -0800)]
resolved conflicts for merge of
55b53d35 to honeycomb-plus-aosp
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
Mike Lockwood [Fri, 11 Mar 2011 21:26:14 +0000 (13:26 -0800)]
am
14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
* commit '
14c875eac750ca096de439225b1a028b1facc58e':
Clear default for USB device/accessory when new matching app is installed
Mike Lockwood [Fri, 11 Mar 2011 21:24:01 +0000 (13:24 -0800)]
Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
Joe Malin [Fri, 11 Mar 2011 21:12:37 +0000 (13:12 -0800)]
am
761b8440: am
9f187296: Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
* commit '
761b84409135641ec27bb828dbd8a1d04a7252fe':
DOC CHANGE: Fix
4084450 monkeyrunner_concepts
Joe Malin [Fri, 11 Mar 2011 21:10:29 +0000 (13:10 -0800)]
am
9f187296: Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
* commit '
9f18729676a58cdfcee98db3329de3397c657d48':
DOC CHANGE: Fix
4084450 monkeyrunner_concepts
Joe Malin [Fri, 11 Mar 2011 21:08:59 +0000 (13:08 -0800)]
Merge "DOC CHANGE: Fix
4084450 monkeyrunner_concepts" into honeycomb
Mike Lockwood [Fri, 11 Mar 2011 19:37:14 +0000 (11:37 -0800)]
am
0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* commit '
0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
Mike Lockwood [Fri, 11 Mar 2011 18:57:06 +0000 (10:57 -0800)]
Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
Christopher Tate [Fri, 11 Mar 2011 18:48:46 +0000 (10:48 -0800)]
am
9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
* commit '
9856fbd40470c9f441b6c38b980210cfdef821e9':
Broaden the filter for wallpaper restore
Christopher Tate [Fri, 11 Mar 2011 18:45:17 +0000 (10:45 -0800)]
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
Dianne Hackborn [Fri, 11 Mar 2011 18:44:46 +0000 (10:44 -0800)]
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
Dianne Hackborn [Fri, 11 Mar 2011 18:44:42 +0000 (10:44 -0800)]
am
492eb33d: Merge "Fix issue #
4081756: Crash when un-stopping applications" into honeycomb-mr1
* commit '
492eb33d549afa65e630d2f4886b1bdf3d979d04':
Fix issue #
4081756: Crash when un-stopping applications
Dianne Hackborn [Fri, 11 Mar 2011 18:39:46 +0000 (10:39 -0800)]
Merge "Fix issue #
4084124: Wingray Often see black screen after market ANR due to
4084121" into honeycomb-mr1
Dianne Hackborn [Fri, 11 Mar 2011 18:38:52 +0000 (10:38 -0800)]
Merge "Fix issue #
4081756: Crash when un-stopping applications" into honeycomb-mr1
Glenn Kasten [Fri, 11 Mar 2011 16:44:35 +0000 (08:44 -0800)]
am
92f2f3ff: Merge "Bug
3012968 DRM output control" into honeycomb-mr1
* commit '
92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug
3012968 DRM output control
Glenn Kasten [Fri, 11 Mar 2011 16:43:05 +0000 (08:43 -0800)]
Merge "Bug
3012968 DRM output control" into honeycomb-mr1
Mike Lockwood [Fri, 11 Mar 2011 14:02:57 +0000 (06:02 -0800)]
am
364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
* commit '
364903bac6b9bfde694f1c0c5c40b6a2af628408':
Support for USB accessory URIs
Mike Lockwood [Fri, 11 Mar 2011 13:56:50 +0000 (05:56 -0800)]
Merge "Support for USB accessory URIs" into honeycomb-mr1
Jim Miller [Fri, 11 Mar 2011 07:01:42 +0000 (23:01 -0800)]
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]
Jim Miller [Fri, 11 Mar 2011 06:59:57 +0000 (22:59 -0800)]
Merge "Fix
3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
Justin Ho [Fri, 11 Mar 2011 06:33:43 +0000 (22:33 -0800)]
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
Justin Ho [Fri, 11 Mar 2011 06:31:29 +0000 (22:31 -0800)]
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
Justin Ho [Fri, 11 Mar 2011 06:24:51 +0000 (22:24 -0800)]
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.
Justin Ho [Fri, 11 Mar 2011 06:22:57 +0000 (22:22 -0800)]
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
Adam Powell [Fri, 11 Mar 2011 05:43:45 +0000 (21:43 -0800)]
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
Justin Ho [Fri, 11 Mar 2011 05:41:53 +0000 (21:41 -0800)]
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
Adam Powell [Fri, 11 Mar 2011 05:40:38 +0000 (21:40 -0800)]
Merge "Fix bug
4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
Justin Ho [Fri, 11 Mar 2011 05:39:24 +0000 (21:39 -0800)]
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
Huahui Wu [Fri, 11 Mar 2011 05:27:24 +0000 (21:27 -0800)]
am
769e132a: Merge "b/
4080388 Improving the performance of ZoomManager" into honeycomb-mr1
* commit '
769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
b/
4080388 Improving the performance of ZoomManager
Huahui Wu [Fri, 11 Mar 2011 05:25:47 +0000 (21:25 -0800)]
Merge "b/
4080388 Improving the performance of ZoomManager" into honeycomb-mr1
Ken Sumrall [Fri, 11 Mar 2011 03:27:05 +0000 (19:27 -0800)]
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.
Ken Sumrall [Fri, 11 Mar 2011 03:24:42 +0000 (19:24 -0800)]
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
Jamie Gennis [Fri, 11 Mar 2011 02:07:57 +0000 (18:07 -0800)]
am
b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
* commit '
b2e606f5f175906ab8c578cb9ba03c728154c50c':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
Jamie Gennis [Fri, 11 Mar 2011 02:06:32 +0000 (18:06 -0800)]
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
Mathias Agopian [Fri, 11 Mar 2011 01:37:47 +0000 (17:37 -0800)]
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
Mathias Agopian [Fri, 11 Mar 2011 01:36:15 +0000 (17:36 -0800)]
Merge "fix [
4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1
Teng-Hui Zhu [Fri, 11 Mar 2011 01:13:03 +0000 (17:13 -0800)]
am
2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
* commit '
2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
Inline HTML5 Video support
Teng-Hui Zhu [Fri, 11 Mar 2011 01:10:29 +0000 (17:10 -0800)]
Merge "Inline HTML5 Video support" into honeycomb-mr1
Adam Powell [Fri, 11 Mar 2011 01:07:52 +0000 (17:07 -0800)]
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
Adam Powell [Fri, 11 Mar 2011 01:06:11 +0000 (17:06 -0800)]
Merge "Fix bug
4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
Jamie Gennis [Thu, 10 Mar 2011 01:05:02 +0000 (17:05 -0800)]
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
Scott Main [Thu, 10 Mar 2011 23:57:38 +0000 (15:57 -0800)]
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
Scott Main [Thu, 10 Mar 2011 23:57:34 +0000 (15:57 -0800)]
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
Xia Wang [Thu, 10 Mar 2011 23:57:27 +0000 (15:57 -0800)]
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.
Scott Main [Thu, 10 Mar 2011 23:40:32 +0000 (15:40 -0800)]
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
Scott Main [Thu, 10 Mar 2011 23:40:23 +0000 (15:40 -0800)]
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
Xia Wang [Thu, 10 Mar 2011 23:29:12 +0000 (15:29 -0800)]
Merge "resolved conflicts for merge of
16cbe575 to honeycomb-mr1" into honeycomb-mr1
Scott Main [Thu, 10 Mar 2011 23:17:42 +0000 (15:17 -0800)]
Merge "docs: fix misc doc bugs bug:
3295540 bug:
3319686 bug:
3337541 bug:
3355640 bug:
3483758" into honeycomb
Scott Main [Thu, 10 Mar 2011 23:13:49 +0000 (15:13 -0800)]
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
Rajneesh Chowdury [Thu, 10 Mar 2011 23:12:34 +0000 (15:12 -0800)]
am
a7118e33: Merge "Fix for
4080402 NPE in Transition.setDuration" into honeycomb-mr1
* commit '
a7118e33b494b26bfbd37c895a1c412cd5da56ec':
Fix for
4080402 NPE in Transition.setDuration
Rajneesh Chowdury [Thu, 10 Mar 2011 23:10:39 +0000 (15:10 -0800)]
Merge "Fix for
4080402 NPE in Transition.setDuration" into honeycomb-mr1
Xia Wang [Thu, 10 Mar 2011 23:09:46 +0000 (15:09 -0800)]
resolved conflicts for merge of
16cbe575 to honeycomb-mr1
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
Eric Fischer [Thu, 10 Mar 2011 22:47:57 +0000 (14:47 -0800)]
am
ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
ff25b975052ddf0e74627cccca742cddd1c8e2f2':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Mar 2011 22:46:18 +0000 (14:46 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Xia Wang [Thu, 10 Mar 2011 22:21:50 +0000 (14:21 -0800)]
Merge "Add WifiStressTest to Wi-Fi only test suite." into honeycomb
Justin Ho [Thu, 10 Mar 2011 21:55:21 +0000 (13:55 -0800)]
am
fa1d72c8: Merge "New textfield search assets Bug:
3321263" into honeycomb-mr1
* commit '
fa1d72c894af5b2ab622a1d7612a3307d3f8b2e1':
New textfield search assets Bug:
3321263
Justin Ho [Thu, 10 Mar 2011 21:53:48 +0000 (13:53 -0800)]
Merge "New textfield search assets Bug:
3321263" into honeycomb-mr1
Eric Fischer [Thu, 10 Mar 2011 21:46:28 +0000 (13:46 -0800)]
am
8d257f85: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
8d257f85acc3316b9ba451337f7cbea9000eb8cf':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Thu, 10 Mar 2011 19:59:17 +0000 (11:59 -0800)]
am
dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread
* commit '
dfcb8c511635431d536fd3ef1894378f4424ef1a':
Don't accept a user-defined dun-capable connection
Eric Fischer [Thu, 10 Mar 2011 19:42:24 +0000 (11:42 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
Robert Greenwalt [Thu, 10 Mar 2011 18:41:36 +0000 (10:41 -0800)]
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
Shimeng (Simon) Wang [Thu, 10 Mar 2011 17:07:22 +0000 (09:07 -0800)]
am
0837fde9: Merge "Don\'t limit zoom scale change by the minimum increment." into honeycomb-mr1
* commit '
0837fde9fd9e29f8ef66a3fe00764e15a6f3d515':
Don't limit zoom scale change by the minimum increment.
Kristian Monsen [Thu, 10 Mar 2011 17:05:18 +0000 (09:05 -0800)]
am
79b87df5: Merge "Fix for bug
4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
* commit '
79b87df58861faeedd85804f6ea4f24eb67aef12':
Fix for bug
4064291 WebView uses PackageManager#getInstalledApps
Shimeng (Simon) Wang [Thu, 10 Mar 2011 17:04:12 +0000 (09:04 -0800)]
Merge "Don't limit zoom scale change by the minimum increment." into honeycomb-mr1
Kristian Monsen [Thu, 10 Mar 2011 17:01:58 +0000 (09:01 -0800)]
Merge "Fix for bug
4064291 WebView uses PackageManager#getInstalledApps" into honeycomb-mr1
Mike Lockwood [Thu, 10 Mar 2011 15:52:30 +0000 (07:52 -0800)]
am
cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit '
cc08c439bc7b0afbdafc5ca18c584d2f7724f3df':
UsbAccessory: Add URI string, replace type string with description
Mike Lockwood [Thu, 10 Mar 2011 15:50:30 +0000 (07:50 -0800)]
Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
TK MUN [Thu, 10 Mar 2011 06:58:12 +0000 (22:58 -0800)]
am
c01fd043: (-s ours) am
4bdab175: DO NOT MERGE WiMAX support
* commit '
c01fd043a92462f12210d45a92d751b49e0e1f62':
DO NOT MERGE WiMAX support
TK MUN [Thu, 10 Mar 2011 06:54:44 +0000 (22:54 -0800)]
am
4bdab175: DO NOT MERGE WiMAX support
* commit '
4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
Jeff Brown [Thu, 10 Mar 2011 03:35:28 +0000 (19:35 -0800)]
Jeff Brown [Thu, 10 Mar 2011 02:36:52 +0000 (18:36 -0800)]
am
efd3266b: Input improvements and bug fixes.
* commit '
efd3266b719eed5f1b217021c0a9e76e4b274b06':
Input improvements and bug fixes.
Jeff Brown [Thu, 10 Mar 2011 02:36:46 +0000 (18:36 -0800)]
am
9e8e40cb: Recognize 3D joysticks. (DO NOT MERGE)
* commit '
9e8e40cb5f8aeb0702002eee60d1ce394bf699ee':
Recognize 3D joysticks. (DO NOT MERGE)
Jeff Brown [Tue, 8 Mar 2011 23:13:06 +0000 (15:13 -0800)]
Input improvements and bug fixes.
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis. This fixes new API that was introduced in MR1.
(Bug:
4066146)
Fixed a bug that might cause a segfault when using a trackball.
Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.
Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.
Improved the batching code to support batching events from different
sources of the same device in parallel. (Bug:
3391564)
Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
Jeff Brown [Thu, 10 Mar 2011 02:29:31 +0000 (18:29 -0800)]
am
18955491: Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
* commit '
18955491ee52aad9bfe6f06e46da77aed6ee092a':
Fix off by one errors in touch motion ranges. (DO NOT MERGE)
Jeff Brown [Thu, 10 Mar 2011 02:29:26 +0000 (18:29 -0800)]
am
55605c9e: Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
* commit '
55605c9e24887693d507f31bee4cde0690bbccff':
Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)
Jeff Brown [Thu, 10 Mar 2011 02:29:22 +0000 (18:29 -0800)]
am
06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
* commit '
06a0c9f5ee1f1c51607446f29ffb9697fa95e549':
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)
Jeff Brown [Thu, 10 Mar 2011 02:27:25 +0000 (18:27 -0800)]
Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1
Jeff Brown [Thu, 10 Mar 2011 02:27:22 +0000 (18:27 -0800)]
Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1
Jeff Brown [Thu, 10 Mar 2011 02:27:16 +0000 (18:27 -0800)]
Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
Dianne Hackborn [Thu, 10 Mar 2011 02:02:53 +0000 (18:02 -0800)]
am
7fd98159: Merge "Fix issue #
4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
* commit '
7fd981598ed0ec275d6da27c71e5e6c9db854e82':
Fix issue #
4066157: ActivityManager.getMemoryClass() returning large memory class
Dianne Hackborn [Thu, 10 Mar 2011 02:00:10 +0000 (18:00 -0800)]
Merge "Fix issue #
4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
Mathias Agopian [Thu, 10 Mar 2011 01:17:24 +0000 (17:17 -0800)]
am
a15b5290: (-s ours) am
33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit '
a15b5290f5785031ec4813fd7e141a9fc39c18fa':
revert the surface purgatory list and dependent changes.
Mathias Agopian [Thu, 10 Mar 2011 01:11:10 +0000 (17:11 -0800)]
am
33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit '
33029221619f14577bd0d0e7c2f815abc8f1b8ea':
revert the surface purgatory list and dependent changes.
Mathias Agopian [Thu, 10 Mar 2011 01:07:27 +0000 (17:07 -0800)]
Merge "revert the surface purgatory list and dependent changes." into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 01:06:10 +0000 (17:06 -0800)]
am
b4341ba6: (-s ours) am
b710a50a: Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
* commit '
b4341ba69750cb71a949525bde4ba962c54908e5':
fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
Mathias Agopian [Thu, 10 Mar 2011 01:06:06 +0000 (17:06 -0800)]
am
a7c836dd: (-s ours) am
c05d35db: Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
* commit '
a7c836ddc0d726120368bf692088f97286e0af3a':
fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
Joe Malin [Thu, 10 Mar 2011 01:04:18 +0000 (17:04 -0800)]
am
87e8ab37: am
b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
* commit '
87e8ab372bd722c5c1a00ff5262acccee5dae5e5':
DOC CHANGE: Add IntelliJ to Dev Guide
Joe Malin [Thu, 10 Mar 2011 01:02:28 +0000 (17:02 -0800)]
am
b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
* commit '
b56cb53f89176d2000e6b6a7aad10b88102abeb8':
DOC CHANGE: Add IntelliJ to Dev Guide
Mathias Agopian [Thu, 10 Mar 2011 00:13:31 +0000 (16:13 -0800)]
revert the surface purgatory list and dependent changes.
6d0f6cb Revert "Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [
3408713] Dialog window invisible sometimes
It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.
Bug:
4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
Joe Malin [Thu, 10 Mar 2011 00:58:29 +0000 (16:58 -0800)]
Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb
Mathias Agopian [Thu, 10 Mar 2011 00:57:32 +0000 (16:57 -0800)]
am
b710a50a: Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
* commit '
b710a50ab6ca36b502f548e8551f620e98bbb1d8':
fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
Mathias Agopian [Thu, 10 Mar 2011 00:57:28 +0000 (16:57 -0800)]
am
c05d35db: Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
* commit '
c05d35db1c57de97888f16ed74718e4c676e4a9b':
fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
Mathias Agopian [Thu, 10 Mar 2011 00:54:21 +0000 (16:54 -0800)]
Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 00:54:14 +0000 (16:54 -0800)]
Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
Adam Powell [Thu, 10 Mar 2011 00:48:20 +0000 (16:48 -0800)]
am
0175e945: Merge "Fix external bug code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1
* commit '
0175e945bb14b2208e00a3a7c9c35261981499a8':
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
Adam Powell [Thu, 10 Mar 2011 00:45:57 +0000 (16:45 -0800)]
Merge "Fix external bug code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1
Wei-Ta Chen [Thu, 10 Mar 2011 00:25:24 +0000 (16:25 -0800)]
am
2498b4b8: Merge "Fix
3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
* commit '
2498b4b8c6b02d553f46f9b48eee9d5295d36f16':
Fix
3510563: memory leak in BitmapRegionDecoder.
Wei-Ta Chen [Thu, 10 Mar 2011 00:21:53 +0000 (16:21 -0800)]
Merge "Fix
3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
Gloria Wang [Thu, 10 Mar 2011 00:07:53 +0000 (16:07 -0800)]
am
54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug
4050039" into honeycomb-mr1
* commit '
54fe58562bb8df5155d4cdf3eb22d950be9dd273':
- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug
4050039