Commit Graph

31318 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Eric Laurent
9d43fc8dde 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
0708bdbda4 Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 2011-03-09 10:56:01 -08:00
Shimeng (Simon) Wang
50bfd60603 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
e720a884e9 Merge "Consider mInitialScale when setting min zoom scale." into honeycomb-mr1 2011-03-09 10:48:57 -08:00
Mike Lockwood
36b89fe39e 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
8890a546d8 Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 2011-03-09 10:44:19 -08:00
Jean-Michel Trivi
6d0fc1cd0d 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
33ab4fc951 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
Irfan Sheriff
d99cd79768 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
1d24d7f7ce Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -08:00
Patrick Scott
8ae27d926f 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
95d38acf8b Merge "Pass the auto login header information to the app." into honeycomb-mr1 2011-03-09 05:05:21 -08:00
Kristian Monsen
d706d1eff0 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
8e947862d5 Merge "Fix for bug 3469242 Turn of extra debugging before shipping" into honeycomb-mr1 2011-03-09 04:29:45 -08:00
Mike Lockwood
c92343ddde 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
Mike Lockwood
298ecf5fdf Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* changes:
  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:52:47 -08:00
Jeff Brown
8b0512713b am 36b077d5: Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1
* commit '36b077d558727ead246434b08de0ce7b955508e1':
  Eliminate some accidental log spam.  (DO NOT MERGE)
2011-03-09 02:48:18 -08:00
Jeff Brown
9caa9da162 Merge "Eliminate some accidental log spam. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 02:45:59 -08:00
Adam Powell
d2c48f88ce am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
  Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:25:10 -08:00
Adam Powell
eb4569e01f Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1 2011-03-09 00:22:53 -08:00