Lorenzo Colitti
8df2477c4e
am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
...
* commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:09:20 -08:00
Lorenzo Colitti
e4a02b6129
am b9da16a1: Support IPv6 in HTTP streaming.
...
* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
2011-03-09 15:09:04 -08:00
Jamie Gennis
25ea3eeb09
am 7b13e27e: am 6167a390: Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
...
* commit '7b13e27ee4a42c205b4a20d145610e8c912e7b0c':
ANativeWindow: add queues-to-window-composer check.
2011-03-09 15:03:04 -08:00
Jim Miller
37bad9e7ac
am c00c887c: am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
...
* commit 'c00c887c118849ac308f6fb1f6fad28b2929e6bb':
Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 15:02:59 -08:00
Robert Ly
16936a4469
am d545a40d: am 788dd5e0: am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit 'd545a40dc92ea876b58c6e87f6e6724406bb2841':
doc change: removing references to eclipse 3.4
2011-03-09 15:02:54 -08:00
Jamie Gennis
7b13e27ee4
am 6167a390: Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
...
* commit '6167a390e34981ea92fc6d5458add2da04ee15bc':
ANativeWindow: add queues-to-window-composer check.
2011-03-09 14:59:30 -08:00
Jim Miller
c00c887c11
am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
...
* commit '5c9248f668201a751500f67cc60bd45ff905751a':
Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 14:59:26 -08:00
Robert Ly
d545a40dc9
am 788dd5e0: am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit '788dd5e076821d8604be7a8e44a1c5ae5f4e198e':
doc change: removing references to eclipse 3.4
2011-03-09 14:59:17 -08:00
Jamie Gennis
6167a390e3
Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
2011-03-09 14:47:56 -08:00
Andreas Huber
20660eeb4d
Support http authentication ala http://foo:bar@host.org in stagefright.
...
Change-Id: I0b20077ad540ec8aa11adf0ca9f4142ea8b8ae98
2011-03-09 14:47:20 -08:00
Jim Miller
5c9248f668
Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
2011-03-09 14:42:56 -08:00
Andreas Huber
fa715315b2
Merge "Use the same http proxy mechanism that webkit uses instead of bypassing proxies."
2011-03-09 14:42:12 -08:00
Robert Ly
788dd5e076
am 2a36cf42: doc change: removing references to eclipse 3.4
...
* commit '2a36cf42fa6f941b2a55f7f391d79b93b8f780f4':
doc change: removing references to eclipse 3.4
2011-03-09 14:39:55 -08:00
Mathias Agopian
c3e8bddecf
am 176e7108: am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
...
* commit '176e71081b17787652c778cd115e079199dac536':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
2011-03-09 14:36:05 -08:00
Stephen Hines
96e11e9ea6
am 67eab1e9: am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
...
* commit '67eab1e9cd9a7bfb1a32492cdaa6f52bf470e11d':
Fix a race condition during Context init/teardown.
2011-03-09 14:35:55 -08:00
Justin Ho
9aea53fecd
New textfield search assets
...
Bug: 3321263
Change-Id: Ifa2dab0df167977317414a18f94b9cb56d6b349a
2011-03-09 14:35:09 -08:00
Mathias Agopian
176e71081b
am 838aa45b: Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
...
* commit '838aa45b99f504596971063003fa8a75e89e4c41':
fix [4026375] SensorManager quaternion functions can call sqrt with a negative number
2011-03-09 14:32:47 -08:00
Stephen Hines
67eab1e9cd
am c8a4b11e: Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
...
* commit 'c8a4b11e1f752b901610472039f981f97a65aae6':
Fix a race condition during Context init/teardown.
2011-03-09 14:32:44 -08:00
Mathias Agopian
838aa45b99
Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number" into honeycomb-mr1
2011-03-09 14:30:16 -08:00
Stephen Hines
c8a4b11e1f
Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
2011-03-09 14:29:57 -08:00
Mike Lockwood
b966b9d9e8
MTP: Convert date created and modified values from seconds to milliseconds
...
BUG: 4026365
Change-Id: Ifd78cca305299ed1cedd6595609d9bf8d520cd8e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 17:28:33 -05:00
Leon Scroggins
2408954d7b
am e1413a9e: am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
...
* commit 'e1413a9e9cdb2dd2792d318542db483b188276c8':
Scroll textfield onscreen when the IME shows.
2011-03-09 14:25:10 -08:00
Leon Scroggins
e1413a9e9c
am 23c5861c: Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
...
* commit '23c5861cde7efef568fa3c61e0f1fa4fe97c7cfa':
Scroll textfield onscreen when the IME shows.
2011-03-09 14:22:50 -08:00
Leon Scroggins
23c5861cde
Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
2011-03-09 14:21:17 -08:00
Huahui Wu
02d7fe1326
am 45e5db99: am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
...
* commit '45e5db99979d9f85e7c3cad3e750b886e3abb105':
b/3307761 Clean up the flag mIsHandlingMultiTouch.
2011-03-09 14:07:20 -08:00
Huahui Wu
45e5db9997
am 166b190e: Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
...
* commit '166b190efc35b7ddad6b011ba537c177e88a2336':
b/3307761 Clean up the flag mIsHandlingMultiTouch.
2011-03-09 14:04:52 -08:00
Dianne Hackborn
32de2f67ea
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
...
...addHistoryRecordLocked(BatteryStatsImpl.java:1210)
It was doing a bunch of stuff without holding a lock!
Change-Id: Ie5b56514370e0bfc87ba7737d75e01df0859817e
2011-03-09 14:03:35 -08:00
Huahui Wu
166b190efc
Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
2011-03-09 13:55:35 -08:00
Mike Lockwood
580b641117
Update USB accessory compatibility library to support new requestPermission API
...
BUG: 4069037
Change-Id: Ieadb86fed577eeb7697d524e8a684ea6ea632f39
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 16:46:35 -05:00
Mike Lockwood
607710ad12
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
...
Permission check should only happen in openAccessory()
Otherwise an application will not be able to check for the current accessory
and ask for permissions (if it is a suitable match for the application)
BUG: 4069037
Change-Id: If5b44ebda2e8077598d96629163cc74aa336589e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 16:43:35 -05:00
Andreas Huber
db7dc9cc89
Use the same http proxy mechanism that webkit uses instead of bypassing proxies.
...
Change-Id: Ifd64664d3052fbfa715c2920984170c2a6190f6b
related-to-bug: 3440271
2011-03-09 13:36:15 -08:00
Leon Scroggins
d69b701284
Scroll textfield onscreen when the IME shows.
...
Bug:4079218
Change-Id: I69fe49582effe664c2288401871922a2cacc7c9c
2011-03-09 16:18:28 -05:00
Ed Heyl
e888b25fb5
am cc7d3c53: am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
...
* commit 'cc7d3c539abd4affd5e95cff8740d9303deac63d':
UsbManager: Fix broken Javadoc links
2011-03-09 13:06:36 -08:00
Ed Heyl
cc7d3c539a
am b22bb1da: Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
...
* commit 'b22bb1dae1213fe9383020a53eeb89de40e7bbd0':
UsbManager: Fix broken Javadoc links
2011-03-09 12:56:17 -08:00
Ed Heyl
b22bb1dae1
Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
2011-03-09 12:53:38 -08:00
Mike Lockwood
980f0430c1
UsbManager: Fix broken Javadoc links
...
Change-Id: Ia8ec7b29a7532feb00a28d6d325c129a9e041d2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 15:49:13 -05:00
Eric Laurent
18632db49a
am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
...
* commit '2dc78477364bd4accb9a603baaafca9a5523dcec':
Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 11:00:22 -08:00
Eric Laurent
2dc7847736
am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
...
* commit 'cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
Fix issue 3439872: video chat and bluetooth SCO
2011-03-09 10:57:49 -08:00
Eric Laurent
cc34967fdc
Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
2598bf600c
am 246b2b31: am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
...
* commit '246b2b313cb545da9d6f791b90d5a1cc4316114e':
Consider mInitialScale when setting min zoom scale.
2011-03-09 10:53:44 -08:00
Shimeng (Simon) Wang
246b2b313c
am 12c37caf: Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
...
* commit '12c37cafe184d5a6ac2a7a097c2fc616e5c1a6c8':
Consider mInitialScale when setting min zoom scale.
2011-03-09 10:51:26 -08:00
Mike Lockwood
e18a4067e0
am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
...
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:51:16 -08:00
Shimeng (Simon) Wang
12c37cafe1
Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1
2011-03-09 10:48:57 -08:00
Mike Lockwood
094c9900de
am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
...
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:48:13 -08:00
Mike Lockwood
2c3ed82600
Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
2011-03-09 10:44:19 -08:00
Robert Ly
2a36cf42fa
doc change: removing references to eclipse 3.4
...
Change-Id: Iac1885a252266e7b15169588b91385cadf41295b
2011-03-09 10:39:26 -08:00
Andreas Huber
f9f6087915
Merge "An HTTP datasource for stagefright using the chromium code."
2011-03-09 10:37:20 -08:00
Jean-Michel Trivi
0984ba25db
am 8d0e2b98: am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
...
* commit '8d0e2b9857e5f77ced233dc408a7acd9e8ab2e8c':
Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:22:56 -08:00
Jean-Michel Trivi
8d0e2b9857
am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
...
* commit '5fa7aac81b471557cd944f762340281e5fa012f9':
Fix bug 4064086 Use a death handler on audio focus changes from mode
2011-03-09 10:20:24 -08:00
Jean-Michel Trivi
5fa7aac81b
Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1
2011-03-09 10:18:31 -08:00