drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,003 Commits 1 Branch 0 Tags
Commit Graph

47003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
18d8a0748d 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
7b5cb3c033 Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1 2011-03-09 15:47:24 -08:00
Mike Lockwood
564f12ebe4 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
23ad53d231 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
a1555b8fa6 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
37c2e3e556 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
aab7d1a29a Merge "Support http authentication ala http://foo:bar@host.org in stagefright." 2011-03-09 15:26:11 -08:00
Lorenzo Colitti
3b093c1339 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
6c3727413b 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
d1e09e0821 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
d6aaec0ce7 am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming. 
* commit 'e4a02b61290fa61955c979cfd1afc17a92bba481':
  Support IPv6 in HTTP streaming.
 2011-03-09 15:17:12 -08:00
Huahui Wu
ff6f4c2eff b/4075349 Make the pinch to zoom more responsive after limits. 
Change-Id: I66ea0aa95ff6a471b7c2ae2cb1ce2fdd0f18ce01
 2011-03-09 15:13:01 -08:00
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