OSDN Git Service
Dianne Hackborn [Wed, 26 Jan 2011 06:09:50 +0000 (22:09 -0800)]
am
b8fc8c26: am
4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
* commit '
b8fc8c26cba829225469a65bf8e35b06de54588e':
Change AsyncTask.execute() back to using a thread pool...
Dianne Hackborn [Wed, 26 Jan 2011 06:08:16 +0000 (22:08 -0800)]
am
4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
* commit '
4fbca2b6138c52405fd7fb241bbf3c21fddd04bb':
Change AsyncTask.execute() back to using a thread pool...
Dianne Hackborn [Wed, 26 Jan 2011 06:05:38 +0000 (22:05 -0800)]
Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb
Mike Lockwood [Wed, 26 Jan 2011 05:35:44 +0000 (21:35 -0800)]
Merge "usb: correct return type of android_hardware_UsbDevice_claim_interface"
Dheeraj Sharma [Wed, 26 Jan 2011 04:38:58 +0000 (20:38 -0800)]
am
d28bb6e2: am
2aaa7764: Merge "VideoEditor:Fix for
3369908" into honeycomb
* commit '
d28bb6e279c17224e843101199d228fe5aad459d':
VideoEditor:Fix for
3369908
Dheeraj Sharma [Wed, 26 Jan 2011 04:36:26 +0000 (20:36 -0800)]
am
2aaa7764: Merge "VideoEditor:Fix for
3369908" into honeycomb
* commit '
2aaa776429f58069e25c8160a9e5b9a969f6e993':
VideoEditor:Fix for
3369908
Dheeraj Sharma [Wed, 26 Jan 2011 04:34:15 +0000 (20:34 -0800)]
Merge "VideoEditor:Fix for
3369908" into honeycomb
Adam Cohen [Wed, 26 Jan 2011 04:23:22 +0000 (20:23 -0800)]
am
7975d8c0: am
0f16477b: Merge "Cleaning up StackView" into honeycomb
* commit '
7975d8c0fec80cb39365cf5cbad4223c5847384f':
Cleaning up StackView
Adam Cohen [Wed, 26 Jan 2011 04:20:45 +0000 (20:20 -0800)]
am
0f16477b: Merge "Cleaning up StackView" into honeycomb
* commit '
0f16477b2d2432a294801a12ac513cd41b00d03c':
Cleaning up StackView
Adam Cohen [Wed, 26 Jan 2011 04:19:17 +0000 (20:19 -0800)]
Merge "Cleaning up StackView" into honeycomb
Daniel Sandler [Wed, 26 Jan 2011 03:01:33 +0000 (19:01 -0800)]
am
c88b19fc: am
34430260: Merge "Fit and finish on status bar:" into honeycomb
* commit '
c88b19fcc847cc5249e88672337ae5879b0af338':
Fit and finish on status bar:
Daniel Sandler [Wed, 26 Jan 2011 02:58:50 +0000 (18:58 -0800)]
am
34430260: Merge "Fit and finish on status bar:" into honeycomb
* commit '
344302600a87175a9fd2bdfbf38708b1d1759731':
Fit and finish on status bar:
Daniel Sandler [Wed, 26 Jan 2011 02:56:32 +0000 (18:56 -0800)]
Merge "Fit and finish on status bar:" into honeycomb
Jeff Brown [Wed, 26 Jan 2011 02:53:14 +0000 (18:53 -0800)]
Merge "Fix build."
Jaikumar Ganesh [Wed, 26 Jan 2011 02:46:53 +0000 (18:46 -0800)]
am
4c2e07d2: (-s ours) am
7f5d652b: Merge "Do Not Merge. Don\'t connect to non keyboard HID devices." into honeycomb
* commit '
4c2e07d2faa8ad2c369d9a2bbab00b5e0b86e00b':
Do Not Merge. Don't connect to non keyboard HID devices.
Jaikumar Ganesh [Wed, 26 Jan 2011 02:44:22 +0000 (18:44 -0800)]
am
7f5d652b: Merge "Do Not Merge. Don\'t connect to non keyboard HID devices." into honeycomb
* commit '
7f5d652b9c92950170f12f0e5a4641076ed75c20':
Do Not Merge. Don't connect to non keyboard HID devices.
Jaikumar Ganesh [Wed, 26 Jan 2011 02:42:12 +0000 (18:42 -0800)]
Merge "Do Not Merge. Don't connect to non keyboard HID devices." into honeycomb
Adam Powell [Wed, 26 Jan 2011 02:34:21 +0000 (18:34 -0800)]
am
5a6bb13a: am
c5573a5a: Merge "Fix button assets and styles." into honeycomb
* commit '
5a6bb13a7ac58a0f4a77e588c0bb8b8465f212fe':
Fix button assets and styles.
Adam Powell [Wed, 26 Jan 2011 02:32:00 +0000 (18:32 -0800)]
am
c5573a5a: Merge "Fix button assets and styles." into honeycomb
* commit '
c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
Fix button assets and styles.
Adam Powell [Wed, 26 Jan 2011 02:29:09 +0000 (18:29 -0800)]
Merge "Fix button assets and styles." into honeycomb
Jeff Brown [Wed, 26 Jan 2011 02:22:55 +0000 (18:22 -0800)]
am
707bf521: (-s ours) am
1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
* commit '
707bf521a4afc71d594c3e433f030bce896834ad':
Disable mouse support. (DO NOT MERGE)
Jeff Brown [Wed, 26 Jan 2011 02:22:50 +0000 (18:22 -0800)]
am
12b2dc90: am
b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
* commit '
12b2dc90883ef4f930a17907acdef3677b0598a5':
Fix crashes caused by some input devices.
Jeff Brown [Wed, 26 Jan 2011 02:20:40 +0000 (18:20 -0800)]
am
1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
* commit '
1b0cee368b35262a8de49c7a3c28e12195817533':
Disable mouse support. (DO NOT MERGE)
Jeff Brown [Wed, 26 Jan 2011 02:20:35 +0000 (18:20 -0800)]
am
b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
* commit '
b1e0a870e4099490127bb917bb4fc7a8f48db893':
Fix crashes caused by some input devices.
Jeff Brown [Wed, 26 Jan 2011 02:18:10 +0000 (18:18 -0800)]
Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
Jeff Brown [Wed, 26 Jan 2011 02:18:05 +0000 (18:18 -0800)]
Merge "Fix crashes caused by some input devices." into honeycomb
Mathias Agopian [Wed, 26 Jan 2011 02:05:06 +0000 (18:05 -0800)]
am
a2852d1f: am
f6926a63: Merge "egl: clear error on function entry" into honeycomb
* commit '
a2852d1f20f2948dc5cad6a4323836c7f8e1d79b':
egl: clear error on function entry
Mathias Agopian [Wed, 26 Jan 2011 02:02:49 +0000 (18:02 -0800)]
am
f6926a63: Merge "egl: clear error on function entry" into honeycomb
* commit '
f6926a63dfdc114789a6acc06396ca826eb64418':
egl: clear error on function entry
Mathias Agopian [Wed, 26 Jan 2011 02:01:03 +0000 (18:01 -0800)]
Merge "egl: clear error on function entry" into honeycomb
Arnaud Berry [Wed, 26 Jan 2011 01:57:21 +0000 (17:57 -0800)]
am
254605c1: am
40f13039: Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
* commit '
254605c1b02c1fed7470c07bc81a64c89bbdc51d':
Fixed the display of the brightness controls in the system panel
Arnaud Berry [Wed, 26 Jan 2011 01:55:09 +0000 (17:55 -0800)]
am
40f13039: Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
* commit '
40f130398cdfc7bc123c6b8871d77d2398990d5e':
Fixed the display of the brightness controls in the system panel
Arnaud Berry [Wed, 26 Jan 2011 01:51:32 +0000 (17:51 -0800)]
Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
Justin Ho [Wed, 26 Jan 2011 01:51:02 +0000 (17:51 -0800)]
am
d5a9e6af: am
77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
* commit '
d5a9e6af132cb88aa7996e7c2bd4827b685c7fd4':
Removing unused assets in mdpi
Justin Ho [Wed, 26 Jan 2011 01:48:59 +0000 (17:48 -0800)]
am
77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
* commit '
77742fe284ebed28e53e155c07c5e50e74529dc9':
Removing unused assets in mdpi
Justin Ho [Wed, 26 Jan 2011 01:46:23 +0000 (17:46 -0800)]
Merge "Removing unused assets in mdpi" into honeycomb
Jim Miller [Wed, 26 Jan 2011 01:45:38 +0000 (17:45 -0800)]
am
72f4e8f4: am
33f1d078: Merge "Fix
3338368: Fix bounds calculation for recent apps view" into honeycomb
* commit '
72f4e8f49776658fcbc28a20531b5268fef916aa':
Fix
3338368: Fix bounds calculation for recent apps view
Jim Miller [Wed, 26 Jan 2011 01:43:47 +0000 (17:43 -0800)]
am
33f1d078: Merge "Fix
3338368: Fix bounds calculation for recent apps view" into honeycomb
* commit '
33f1d0780041d962f911b8908cb4929589f7e4fe':
Fix
3338368: Fix bounds calculation for recent apps view
Jim Miller [Wed, 26 Jan 2011 01:41:59 +0000 (17:41 -0800)]
Merge "Fix
3338368: Fix bounds calculation for recent apps view" into honeycomb
Guang Zhu [Wed, 26 Jan 2011 01:41:15 +0000 (17:41 -0800)]
am
eb84ac4d: am
5794f230: change the way test app waits for gc
* commit '
eb84ac4dd97b65f342d640b1763224bb3cdf2256':
change the way test app waits for gc
Guang Zhu [Wed, 26 Jan 2011 01:39:21 +0000 (17:39 -0800)]
am
5794f230: change the way test app waits for gc
* commit '
5794f2302209981c64425ea2b661b17f00b8f808':
change the way test app waits for gc
Adam Powell [Wed, 26 Jan 2011 00:36:35 +0000 (16:36 -0800)]
am
d144b449: am
d63219f6: Merge "Fix bug
3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
* commit '
d144b449b1e8f6e41666257d68d4dec37c3d0951':
Fix bug
3343940 - Legacy dialogs should use overlay action mode UI
Jeff Hamilton [Wed, 26 Jan 2011 00:34:29 +0000 (16:34 -0800)]
am
adb8c2f9: Merge "resolved conflicts for merge of
f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
adb8c2f970fb9436fa2b7f515e51efcc878ce4e6':
Fix the build, proper current.xml.
Jim Miller [Wed, 26 Jan 2011 00:34:16 +0000 (16:34 -0800)]
am
a497e944: am
adc14026: Merge "Fix
3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
* commit '
a497e9448ef2e52db28ba0c400ae3b94ac1b6fc4':
Fix
3381660: Make modifier keys in PasswordUnlock match IME
Adam Powell [Wed, 26 Jan 2011 00:34:01 +0000 (16:34 -0800)]
am
d63219f6: Merge "Fix bug
3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
* commit '
d63219f62248d067462403bed9e0539df53dd2dd':
Fix bug
3343940 - Legacy dialogs should use overlay action mode UI
Jeff Hamilton [Wed, 26 Jan 2011 00:29:48 +0000 (16:29 -0800)]
Merge "resolved conflicts for merge of
f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp
Jeff Hamilton [Wed, 26 Jan 2011 00:29:11 +0000 (18:29 -0600)]
resolved conflicts for merge of
f0b7977f to honeycomb-plus-aosp
Change-Id: I6de7a12f0f491f02a6765d1f3fbd28ba3a62bea3
Adam Powell [Wed, 26 Jan 2011 00:27:16 +0000 (16:27 -0800)]
Merge "Fix bug
3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
Brad Fitzpatrick [Wed, 26 Jan 2011 00:25:25 +0000 (16:25 -0800)]
am
47864180: am
6af61b84: am
a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit '
47864180918702768d26f48ec3213c935cea0c4b':
android.os.Message: respect sPoolSize
Jim Miller [Wed, 26 Jan 2011 00:24:23 +0000 (16:24 -0800)]
am
adc14026: Merge "Fix
3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
* commit '
adc14026fbd21d5238a47f402c7b316a7aeac92e':
Fix
3381660: Make modifier keys in PasswordUnlock match IME
Costin Manolache [Wed, 26 Jan 2011 00:22:34 +0000 (16:22 -0800)]
am
f7f46dda: am
b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb
* commit '
f7f46dda1e3391661138242be767ecefc15750d2':
If 'customTokens', let authenticator handle notification.
Xavier Ducrohet [Wed, 26 Jan 2011 00:22:18 +0000 (16:22 -0800)]
am
94243b0e: am
cf2b9ca1: Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
* commit '
94243b0e1bfe2cd7d76caf3cb580d53cb9028a18':
LayoutLib: return ViewInfo for all merged items + Build init.
Mathias Agopian [Wed, 26 Jan 2011 00:22:07 +0000 (16:22 -0800)]
am
9392c41b: (-s ours) am
df836892: (-s ours) am
239fd805: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '
9392c41b99cb136d6c2a058f6bc3ffb83daf5a46':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:22:03 +0000 (16:22 -0800)]
am
a1bed9d1: (-s ours) am
af4fa5d8: (-s ours) am
1955a5c9: Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '
a1bed9d179c86f89b29f891ecd53da21c4e5a13f':
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:21:59 +0000 (16:21 -0800)]
am
3880726b: (-s ours) am
6b72702f: (-s ours) am
d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit '
3880726b75097ed0bd92ece1275da5e9991df06d':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:21:54 +0000 (16:21 -0800)]
am
55fb350e: (-s ours) am
2d665dd3: (-s ours) am
043a3cdd: Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '
55fb350ef82099c2dd98119735cae10e5eeacfff':
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:21:47 +0000 (16:21 -0800)]
am
166a3d56: (-s ours) am
88bccab3: (-s ours) am
d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '
166a3d56ef3d62036119dcda2881953e487b202f':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Brad Fitzpatrick [Wed, 26 Jan 2011 00:21:29 +0000 (16:21 -0800)]
am
6af61b84: am
a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit '
6af61b843511bc5b669d30b980c4a9e2682da47c':
android.os.Message: respect sPoolSize
Jeff Hamilton [Wed, 26 Jan 2011 00:21:28 +0000 (16:21 -0800)]
am
95f7c854: Merge "resolved conflicts for merge of
eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
95f7c8549928c0b383b3b3651224ded6b05a2f51':
Use classnames instead of ints for NFC techs.
Gilles Debunne [Wed, 26 Jan 2011 00:21:22 +0000 (16:21 -0800)]
am
f5c7cbad: am
4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb
* commit '
f5c7cbadd5a7a53e4e8b79aadde5835dfe907ad0':
A long press on the selection handle no longer selects the word.
Jim Miller [Wed, 26 Jan 2011 00:21:21 +0000 (16:21 -0800)]
Merge "Fix
3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
Romain Guy [Wed, 26 Jan 2011 00:21:04 +0000 (16:21 -0800)]
am
14952971: am
5c4c0d50: Merge "Fix documentation typo." into honeycomb
* commit '
14952971803e2cd95c201416c7ff3d641d85c0f9':
Fix documentation typo.
Mike Lockwood [Wed, 26 Jan 2011 00:20:56 +0000 (16:20 -0800)]
am
c80daa1b: am
f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
* commit '
c80daa1b05b8f1d2873df23821ae2c5344e76fb8':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
Mike Lockwood [Wed, 26 Jan 2011 00:20:50 +0000 (16:20 -0800)]
am
7fadb5e7: am
2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '
7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
MTP: Fix race conditions in MtpServer JNI code
James Dong [Wed, 26 Jan 2011 00:20:34 +0000 (16:20 -0800)]
am
45800cf9: am
3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb
* commit '
45800cf939d716a6d6435872f5f876b2cfd2689d':
Report errors to applications if AudioRecord->start() fails
Justin Ho [Wed, 26 Jan 2011 00:20:26 +0000 (16:20 -0800)]
am
55a24b7a: am
26faf54d: Merge "New contact picture" into honeycomb
* commit '
55a24b7a4e3a6c19efe64737148857c162ea3a1e':
New contact picture
Dianne Hackborn [Wed, 26 Jan 2011 00:20:16 +0000 (16:20 -0800)]
am
a58552e0: am
f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb
* commit '
a58552e03de2f24aef735e94fcfab12a0078a3b3':
Argh forget to include my final part of the change.
Dianne Hackborn [Wed, 26 Jan 2011 00:19:48 +0000 (16:19 -0800)]
am
1a904ded: am
8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
* commit '
1a904dedbb5a15b3e60cac0fab83a3734701aff6':
New extra for GET_CONTENT.
Adam Powell [Wed, 26 Jan 2011 00:19:25 +0000 (16:19 -0800)]
am
e0c14848: am
5dcc9bd7: Merge "Fix bug
3387855 - Menu flashes on left side of screen" into honeycomb
* commit '
e0c148484e3855bfa48b5e874ac3a1d2663784dd':
Fix bug
3387855 - Menu flashes on left side of screen
Santosh Madhava [Wed, 26 Jan 2011 00:19:17 +0000 (16:19 -0800)]
am
d6451721: am
1c9ac916: Merge "Fix for issue
3385068 : Play gets out of sync" into honeycomb
* commit '
d645172123f6aac530986ede22fae13f647ccb9f':
Fix for issue
3385068 : Play gets out of sync
Scott Main [Wed, 26 Jan 2011 00:19:09 +0000 (16:19 -0800)]
am
108841ff: am
31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb
* commit '
108841ff943a592702698ca17ccfe7d2ce2798ed':
docs: revise and amend platform notes for preview
Jeff Brown [Wed, 26 Jan 2011 00:18:59 +0000 (16:18 -0800)]
am
391ef42c: am
3168a137: Merge "Fix surface frame size reporting." into honeycomb
* commit '
391ef42c92ab97e5c22a720973790696d30576ca':
Fix surface frame size reporting.
Gilles Debunne [Wed, 26 Jan 2011 00:18:51 +0000 (16:18 -0800)]
am
7a417821: am
47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb
* commit '
7a417821957bac70bfd4cb4a357b143a1a1570e3':
Fix for a call to startActivity from outside of an app.
Jeff Hamilton [Wed, 26 Jan 2011 00:15:58 +0000 (16:15 -0800)]
am
c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit '
c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
Fix the build, proper current.xml.
Costin Manolache [Wed, 26 Jan 2011 00:14:42 +0000 (16:14 -0800)]
am
b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb
* commit '
b324911b473d20d10c0107273721791bc8b04568':
If 'customTokens', let authenticator handle notification.
Costin Manolache [Wed, 26 Jan 2011 00:13:12 +0000 (16:13 -0800)]
Merge "If 'customTokens', let authenticator handle notification." into honeycomb
Jeff Hamilton [Wed, 26 Jan 2011 00:11:37 +0000 (16:11 -0800)]
Merge "Fix the build, proper current.xml." into gingerbread
Xavier Ducrohet [Wed, 26 Jan 2011 00:10:17 +0000 (16:10 -0800)]
am
cf2b9ca1: Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
* commit '
cf2b9ca11ab493728fe75c1ffcd6bc2e273e1d55':
LayoutLib: return ViewInfo for all merged items + Build init.
Xavier Ducrohet [Wed, 26 Jan 2011 00:08:03 +0000 (16:08 -0800)]
Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
Mathias Agopian [Wed, 26 Jan 2011 00:04:48 +0000 (16:04 -0800)]
am
df836892: (-s ours) am
239fd805: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '
df8368925acd4593a309e06548d7f900bf8d94df':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:04:44 +0000 (16:04 -0800)]
am
af4fa5d8: (-s ours) am
1955a5c9: Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '
af4fa5d83d70a9af9ede67c47eae72d1db0d6d74':
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:04:39 +0000 (16:04 -0800)]
am
6b72702f: (-s ours) am
d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit '
6b72702f305cf3aad80ed6e9f962280be745b588':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:04:33 +0000 (16:04 -0800)]
am
2d665dd3: (-s ours) am
043a3cdd: Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '
2d665dd37a6677a1e8f3f753e1656780286cfa29':
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Mathias Agopian [Wed, 26 Jan 2011 00:04:27 +0000 (16:04 -0800)]
am
88bccab3: (-s ours) am
d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '
88bccab35c81907db09be3f511a2c1fd379a75b4':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Jeff Brown [Wed, 26 Jan 2011 00:02:22 +0000 (16:02 -0800)]
Fix crashes caused by some input devices.
The touch screen sometimes reports more than 10 pointers even though that's
all we asked for. When this happens, we start dropping events with more
than 10 pointers. This confuses applications and causes them to crash.
Raised the limit to 16 pointers.
Bug:
3331247
The default behavior was to identify all touch devices as touch screens.
External devices that are plugged in are more likely to be touch pads
not attached to a screen. Changed the default to be a touch pad
and renamed some internal constants to avoid confusion.
A certain mouse happens to also behave like a touch pad. That caused
problems because we would see multiple concurrent traces of motion events
coming from the same input device so we would batch them up.
Added code to ensure that we don't batch events unless they come from
the same *source* in addition to coming from the same *device*.
Due to batching or misbehaving drivers, it's possible for the set of
pointer ids to be different from what we expect when it comes time to
split motion events across windows. As a result, we can generate motion
events with 0 pointers. When we try to deliver those events, we cause
an error in the InputTransport so we tear down the InputChannel and kill
the application.
Added code to check out assumption about pointer ids and drop the
event gracefully instead.
Patched up the tests to take into account the change in default behavior
for identifying touch screens and touch pads.
Change-Id: Ic364bd4cb4cc6335d4a1213a26d6bdadc7e33505
Jeff Hamilton [Wed, 26 Jan 2011 00:02:19 +0000 (16:02 -0800)]
Merge "resolved conflicts for merge of
eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Gilles Debunne [Wed, 26 Jan 2011 00:01:37 +0000 (16:01 -0800)]
am
4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb
* commit '
4df103cf3d134bc0e428656e07c43eda2687ecdb':
A long press on the selection handle no longer selects the word.
Jeff Hamilton [Wed, 26 Jan 2011 00:00:41 +0000 (18:00 -0600)]
resolved conflicts for merge of
eb645a15 to honeycomb-plus-aosp
Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13
Gilles Debunne [Tue, 25 Jan 2011 23:59:01 +0000 (15:59 -0800)]
Merge "A long press on the selection handle no longer selects the word." into honeycomb
Romain Guy [Tue, 25 Jan 2011 23:50:18 +0000 (15:50 -0800)]
am
5c4c0d50: Merge "Fix documentation typo." into honeycomb
* commit '
5c4c0d50fc1653fb6158e20d9b0af0325a80287c':
Fix documentation typo.
Romain Guy [Tue, 25 Jan 2011 23:48:17 +0000 (15:48 -0800)]
Merge "Fix documentation typo." into honeycomb
Mike Lockwood [Tue, 25 Jan 2011 23:48:06 +0000 (15:48 -0800)]
am
f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
* commit '
f10d940413000732f1cd35bcb113c41019c7e3b7':
StagefrightMediaScanner: Close metadata retriever after we are done scanning
Mike Lockwood [Tue, 25 Jan 2011 23:46:25 +0000 (15:46 -0800)]
Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
Mike Lockwood [Tue, 25 Jan 2011 23:45:48 +0000 (15:45 -0800)]
am
2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '
2b3da7ab61ac920881f35bbf66234c073d79ba24':
MTP: Fix race conditions in MtpServer JNI code
Brad Fitzpatrick [Tue, 25 Jan 2011 23:44:33 +0000 (15:44 -0800)]
am
a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit '
a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
android.os.Message: respect sPoolSize
Mike Lockwood [Tue, 25 Jan 2011 23:44:28 +0000 (15:44 -0800)]
Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
Michael I. Gold [Fri, 21 Jan 2011 23:39:38 +0000 (15:39 -0800)]
egl: clear error on function entry
Clear the current thread error state on entry to API functions as
mandated by the EGL 1.4 specification, section 3.1. glGetError
returns additional information about the "most recent EGL function".
Change-Id: Ic24c64b39294ffc1a4e43fa72663e076b9d7decf
James Dong [Tue, 25 Jan 2011 23:33:27 +0000 (15:33 -0800)]
am
3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb
* commit '
3115dad3fc8493ff510b9f6a46b18d951bf5c162':
Report errors to applications if AudioRecord->start() fails
Justin Ho [Tue, 25 Jan 2011 23:33:23 +0000 (15:33 -0800)]
am
26faf54d: Merge "New contact picture" into honeycomb
* commit '
26faf54debfc7386a483eccfcddf1c051c653292':
New contact picture
James Dong [Tue, 25 Jan 2011 23:31:09 +0000 (15:31 -0800)]
Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb
Justin Ho [Tue, 25 Jan 2011 23:31:08 +0000 (15:31 -0800)]
Merge "New contact picture" into honeycomb
OSDN Git Service
