Mike Lockwood
8a9cf92520
Merge "usb: correct return type of android_hardware_UsbDevice_claim_interface"
2011-01-25 21:35:44 -08:00
Jason Sams
1afbf54dd1
Migrating functions for on device linking.
...
Change-Id: I41dc1551ada53370f2b06c49cc76089b1e72ac5b
2011-01-25 21:33:44 -08:00
Erik Gilling
215532c579
usb: correct return type of android_hardware_UsbDevice_claim_interface
...
Change-Id: I1e8bfb8d52b5bb87e5bb7249ab439740f57e63f3
2011-01-25 21:13:11 -08:00
Mathias Agopian
d35c6667c8
fix [3385504] Surface flinger hang when adding dim surface
...
Change-Id: I8e0cda414bcad5854d2ca5dde8370bfd8b2e5ea4
2011-01-25 20:52:46 -08:00
Santosh Madhava
1abe0050fa
Fix for issue 3366265 : Native crash exporting movie
...
Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
2011-01-25 20:41:55 -08:00
Dheeraj Sharma
53df92d84e
am d28bb6e2: am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
...
* commit 'd28bb6e279c17224e843101199d228fe5aad459d':
VideoEditor:Fix for 3369908
2011-01-25 20:38:58 -08:00
Dheeraj Sharma
d28bb6e279
am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
...
* commit '2aaa776429f58069e25c8160a9e5b9a969f6e993':
VideoEditor:Fix for 3369908
2011-01-25 20:36:26 -08:00
Dheeraj Sharma
2aaa776429
Merge "VideoEditor:Fix for 3369908" into honeycomb
2011-01-25 20:34:15 -08:00
Adam Cohen
27d209f94a
am 7975d8c0: am 0f16477b: Merge "Cleaning up StackView" into honeycomb
...
* commit '7975d8c0fec80cb39365cf5cbad4223c5847384f':
Cleaning up StackView
2011-01-25 20:23:22 -08:00
Santosh Madhava
de412d277c
Review rework for issue 3385068 : Play gets out of sync
...
Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
2011-01-25 20:22:41 -08:00
Adam Cohen
7975d8c0fe
am 0f16477b: Merge "Cleaning up StackView" into honeycomb
...
* commit '0f16477b2d2432a294801a12ac513cd41b00d03c':
Cleaning up StackView
2011-01-25 20:20:45 -08:00
Adam Cohen
0f16477b2d
Merge "Cleaning up StackView" into honeycomb
2011-01-25 20:19:17 -08:00
Daniel Sandler
11d43082c5
am c88b19fc: am 34430260: Merge "Fit and finish on status bar:" into honeycomb
...
* commit 'c88b19fcc847cc5249e88672337ae5879b0af338':
Fit and finish on status bar:
2011-01-25 19:01:33 -08:00
Daniel Sandler
c88b19fcc8
am 34430260: Merge "Fit and finish on status bar:" into honeycomb
...
* commit '344302600a87175a9fd2bdfbf38708b1d1759731':
Fit and finish on status bar:
2011-01-25 18:58:50 -08:00
Daniel Sandler
344302600a
Merge "Fit and finish on status bar:" into honeycomb
2011-01-25 18:56:32 -08:00
Jeff Brown
3ae881ffc7
Merge "Fix build."
2011-01-25 18:53:14 -08:00
Jeff Brown
0a9f335e70
Fix build.
...
Change-Id: Id08f3ccced1281f1c6840cc67713bcedcf9a53c0
2011-01-25 18:52:34 -08:00
Jaikumar Ganesh
2332bb4e4f
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.
2011-01-25 18:46:53 -08:00
Jaikumar Ganesh
4c2e07d2fa
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.
2011-01-25 18:44:22 -08:00
Jaikumar Ganesh
7f5d652b9c
Merge "Do Not Merge. Don't connect to non keyboard HID devices." into honeycomb
2011-01-25 18:42:12 -08:00
Adam Powell
8722fba3a3
am 5a6bb13a: am c5573a5a: Merge "Fix button assets and styles." into honeycomb
...
* commit '5a6bb13a7ac58a0f4a77e588c0bb8b8465f212fe':
Fix button assets and styles.
2011-01-25 18:34:21 -08:00
Adam Powell
5a6bb13a7a
am c5573a5a: Merge "Fix button assets and styles." into honeycomb
...
* commit 'c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
Fix button assets and styles.
2011-01-25 18:32:00 -08:00
Adam Powell
c5573a5ac4
Merge "Fix button assets and styles." into honeycomb
2011-01-25 18:29:09 -08:00
Adam Powell
4f0d85c0cc
Fix button assets and styles.
...
This fixes some padding issues that broke apps during the last update.
Change-Id: Icdce5231f4497f8f0be0ab842a03cbfdfc501c5a
2011-01-25 18:25:20 -08:00
Jeff Brown
41632b9f7d
am 707bf521: (-s ours) am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
...
* commit '707bf521a4afc71d594c3e433f030bce896834ad':
Disable mouse support. (DO NOT MERGE)
2011-01-25 18:22:55 -08:00
Jeff Brown
ab2f096030
am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
...
* commit '12b2dc90883ef4f930a17907acdef3677b0598a5':
Fix crashes caused by some input devices.
2011-01-25 18:22:50 -08:00
Jeff Brown
707bf521a4
am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
...
* commit '1b0cee368b35262a8de49c7a3c28e12195817533':
Disable mouse support. (DO NOT MERGE)
2011-01-25 18:20:40 -08:00
Jeff Brown
12b2dc9088
am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
...
* commit 'b1e0a870e4099490127bb917bb4fc7a8f48db893':
Fix crashes caused by some input devices.
2011-01-25 18:20:35 -08:00
Jeff Brown
1b0cee368b
Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
2011-01-25 18:18:10 -08:00
Jeff Brown
b1e0a870e4
Merge "Fix crashes caused by some input devices." into honeycomb
2011-01-25 18:18:05 -08:00
Justin Ho
d5f16ca78e
Removing unused assets
...
Change-Id: I80b2d559f2bb3511ad8da9391e5f54effe91d837
2011-01-25 18:10:04 -08:00
Mathias Agopian
e1ec077497
am a2852d1f: am f6926a63: Merge "egl: clear error on function entry" into honeycomb
...
* commit 'a2852d1f20f2948dc5cad6a4323836c7f8e1d79b':
egl: clear error on function entry
2011-01-25 18:05:06 -08:00
Mathias Agopian
a2852d1f20
am f6926a63: Merge "egl: clear error on function entry" into honeycomb
...
* commit 'f6926a63dfdc114789a6acc06396ca826eb64418':
egl: clear error on function entry
2011-01-25 18:02:49 -08:00
Mathias Agopian
f6926a63df
Merge "egl: clear error on function entry" into honeycomb
2011-01-25 18:01:03 -08:00
Arnaud Berry
5563104ec8
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
2011-01-25 17:57:21 -08:00
Arnaud Berry
254605c1b0
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
2011-01-25 17:55:09 -08:00
Jeff Brown
7fe57bfa0d
Disable mouse support. (DO NOT MERGE)
...
Change-Id: Ica9703a18195079d227caff8c2389c750559f3d0
2011-01-25 17:52:01 -08:00
Arnaud Berry
40f130398c
Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
2011-01-25 17:51:32 -08:00
Justin Ho
94552922b2
am d5a9e6af: am 77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
...
* commit 'd5a9e6af132cb88aa7996e7c2bd4827b685c7fd4':
Removing unused assets in mdpi
2011-01-25 17:51:02 -08:00
Justin Ho
d5a9e6af13
am 77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
...
* commit '77742fe284ebed28e53e155c07c5e50e74529dc9':
Removing unused assets in mdpi
2011-01-25 17:48:59 -08:00
Justin Ho
77742fe284
Merge "Removing unused assets in mdpi" into honeycomb
2011-01-25 17:46:23 -08:00
Jim Miller
53fd3bc82f
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
2011-01-25 17:45:38 -08:00
Jim Miller
72f4e8f497
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
2011-01-25 17:43:47 -08:00
Jim Miller
33f1d07800
Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
2011-01-25 17:41:59 -08:00
Guang Zhu
8cd7861650
am eb84ac4d: am 5794f230: change the way test app waits for gc
...
* commit 'eb84ac4dd97b65f342d640b1763224bb3cdf2256':
change the way test app waits for gc
2011-01-25 17:41:15 -08:00
Guang Zhu
eb84ac4dd9
am 5794f230: change the way test app waits for gc
...
* commit '5794f2302209981c64425ea2b661b17f00b8f808':
change the way test app waits for gc
2011-01-25 17:39:21 -08:00
Jaikumar Ganesh
55b6b862c8
Do Not Merge. Don't connect to non keyboard HID devices.
...
Bug: 3385950
Change-Id: I2cfb17467c3d2fd383747111cd990d39f10f5136
2011-01-25 17:38:11 -08:00
Kenny Root
b7db2726e9
Make OBB results a one-way call
...
OBB result back to an application needs to be a one-way binder call.
Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
2011-01-25 17:29:59 -08:00
Guang Zhu
5794f23022
change the way test app waits for gc
...
gcSoftReferences methods are being obsoleted, so we need a different
approach to wait for gc: create a CountDownLatch and release it in
a dummy object's finalizer, call gc and await on the CDL.
Change-Id: I54d9e6bc05540b16ee1f3959ace9008041ac4903
2011-01-25 17:25:59 -08:00
Adam Cohen
78db1aa911
Cleaning up StackView
...
Change-Id: I38cd8a5f2d25973d3f97551be0a873ca35044ed9
2011-01-25 17:09:34 -08:00