Adam Powell
5481a938d3
am 94929217: am 0175e945: Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183 " into honeycomb-mr1
...
* commit '94929217ae3fd4c577ed8b0f0391958de95bfaec':
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
2011-03-09 16:50:54 -08:00
Adam Powell
74b4bf2b6e
am 0175e945: Merge "Fix external bug http://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
2011-03-09 16:48:20 -08:00
Adam Powell
aca0345e25
Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183 " into honeycomb-mr1
2011-03-09 16:45:57 -08:00
Wei-Ta Chen
5e5a5e62c0
am a2048056: am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
...
* commit 'a204805627eddeac0a1777c69ce62d31d339d4cd':
Fix 3510563: memory leak in BitmapRegionDecoder.
2011-03-09 16:27:25 -08:00
Wei-Ta Chen
b0864a1b72
am 2498b4b8: Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
...
* commit '2498b4b8c6b02d553f46f9b48eee9d5295d36f16':
Fix 3510563: memory leak in BitmapRegionDecoder.
2011-03-09 16:25:24 -08:00
Wei-Ta Chen
a9d8122bb6
Merge "Fix 3510563: memory leak in BitmapRegionDecoder." into honeycomb-mr1
2011-03-09 16:21:53 -08:00
Gloria Wang
28a673511d
am 256290b1: 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 '256290b1efac8b0798964585c3c3d4600d9587ef':
- 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
2011-03-09 16:11:04 -08:00
Gloria Wang
85b8ba9fda
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
2011-03-09 16:07:53 -08:00
Gloria Wang
27be7ae7c8
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
2011-03-09 16:05:59 -08:00
Dianne Hackborn
a200cc21cd
am de478eca: am 7b5cb3c0: Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
...
* commit 'de478eca19adc263c033d777b0e6a33c8113fd24':
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
2011-03-09 15:53:46 -08:00
Mike Lockwood
7b027e8055
am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
...
* commit '18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896':
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:53:43 -08:00
Dianne Hackborn
8d3fe6613a
am 7b5cb3c0: Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
...
* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl...
2011-03-09 15:50:34 -08:00
Mike Lockwood
1316ac7a59
am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
...
* commit '564f12ebe409bead467eee04dfd719e97367e520':
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:50:31 -08:00
Dianne Hackborn
978abf43d3
Merge "Fix issue #4068088 : NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1
2011-03-09 15:47:24 -08:00
Mike Lockwood
ba6f57aab6
Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
...
* changes:
MTP: Convert date created and modified values from seconds to milliseconds
Update USB accessory compatibility library to support new requestPermission API
UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:47:10 -08:00
Huahui Wu
4ea2e363e8
am a1555b8f: am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
...
* commit 'a1555b8fa613b6374d2453fa73ff8eb1c1dfffc3':
b/4075349 Make the pinch to zoom more responsive after limits.
2011-03-09 15:42:14 -08:00
Huahui Wu
9ff302118c
am 37c2e3e5: Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
...
* commit '37c2e3e55641e91dd0ec3dbd296bc6bc7c7641cf':
b/4075349 Make the pinch to zoom more responsive after limits.
2011-03-09 15:39:56 -08:00
Huahui Wu
92f292aea4
Merge "b/4075349 Make the pinch to zoom more responsive after limits." into honeycomb-mr1
2011-03-09 15:37:56 -08:00
Andreas Huber
87330d8ce3
Merge "Support http authentication ala http://foo:bar@host.org in stagefright."
2011-03-09 15:26:11 -08:00
Lorenzo Colitti
75a1626999
am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
...
* commit 'd1e09e08210e755034bbdd07e1f48b35ec9a4752':
Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:21:34 -08:00
Lorenzo Colitti
9d0745185b
am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.
...
* commit 'd6aaec0ce7639a9d8bb73983711e20545b55e860':
Support IPv6 in HTTP streaming.
2011-03-09 15:21:31 -08:00
Lorenzo Colitti
9898ee608d
am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
...
* commit '8df2477c4e7e5bf72d6d1216ae5184c53304470e':
Support IPv6->IPv4 fallback in HTTP streaming.
2011-03-09 15:17:20 -08:00
Lorenzo Colitti
67e4f2e2c4
am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.
...
* commit 'e4a02b61290fa61955c979cfd1afc17a92bba481':
Support IPv6 in HTTP streaming.
2011-03-09 15:17:12 -08:00
Lorenzo Colitti
726fda5a9f
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
7d838a4cad
am b9da16a1: Support IPv6 in HTTP streaming.
...
* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
2011-03-09 15:09:04 -08:00
Jamie Gennis
7488244282
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
656492e460
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
cb03f8b9d8
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
90b19d71d2
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
6f474dd14f
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
ee939a6636
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
ec8a5ef78d
Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
2011-03-09 14:47:56 -08:00
Jim Miller
5377ae9ad4
Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
2011-03-09 14:42:56 -08:00
Andreas Huber
1c1e87cfd5
Merge "Use the same http proxy mechanism that webkit uses instead of bypassing proxies."
2011-03-09 14:42:12 -08:00
Robert Ly
83c400fb05
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
f56f3d7dc9
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
2175fbddee
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
Mathias Agopian
68dd07d845
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
88cc428236
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
9bc46ccbdc
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
83a10cb3aa
Merge "Fix a race condition during Context init/teardown." into honeycomb-mr1
2011-03-09 14:29:57 -08:00
Leon Scroggins
6599081fc7
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
400b50cdf8
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
6d78bf0e1c
Merge "Scroll textfield onscreen when the IME shows." into honeycomb-mr1
2011-03-09 14:21:17 -08:00
Huahui Wu
7cba49b2e6
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
8ddf712098
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
Huahui Wu
89381d2df3
Merge "b/3307761 Clean up the flag mIsHandlingMultiTouch." into honeycomb-mr1
2011-03-09 13:55:35 -08:00
Ed Heyl
d625d10792
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
20a46fc8e9
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
97fe840e61
Merge "UsbManager: Fix broken Javadoc links" into honeycomb-mr1
2011-03-09 12:53:38 -08:00