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

46807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Jim Miller
5c9248f668 Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1 2011-03-09 14:42:56 -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
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
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
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
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
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
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
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
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
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
Mike Lockwood
c6f23e8521 Change UsbManager.requestPermission to only grant permission temporarily 
If the user approves an application to access a USB device or accessory
without choosing it as the default application, then permission is granted
only until the device or accessory is disconnected.
Only applications chosen as the default choice have permissions assigned persistently.

BUG: 4061035

Change-Id: Ic4f6271a91b2fc56bbeef82c579e26d88c63ae56
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-09 12:33:00 -05:00
Irfan Sheriff
865871850b am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1 
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
 2011-03-09 09:32:55 -08:00
Irfan Sheriff
7ad85eb62f Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -08:00
Huahui Wu
9386a24eb1 b/3307761 Clean up the flag mIsHandlingMultiTouch. 
The flag mIsHandlingMultiTouch was used to remove the out of order
touchMove events. After the fix b/3307761, it is no more needed.

Change-Id: I4d03131e2a22c53cc79c4105e39f078f1bea88ca
 2011-03-09 09:26:36 -08:00
Patrick Scott
5d534f288d am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1 
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
  Pass the auto login header information to the app.
 2011-03-09 05:08:15 -08:00
Patrick Scott
ea44c7c714 Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Kristian Monsen
b4ca8b7696 am 9e697ee9: Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 
* commit '9e697ee9fc9dcc21348d799e1e0bc83dd3abdb18':
  Fix for bug 3469242 Turn of extra debugging before shipping
 2011-03-09 04:32:28 -08:00
Kristian Monsen
9e697ee9fc Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -08:00
Mike Lockwood
093cf07f3c am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1 
* commit '9e8e4ea0a839b561d329758cddbfd0f7ea23f593':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
 2011-03-09 03:54:28 -08:00