OSDN Git Service
Brad Fitzpatrick [Tue, 15 Mar 2011 18:30:08 +0000 (11:30 -0700)]
am
29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
* commit '
29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
Fixing improper boxing to Integer instead of Long.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:30:04 +0000 (11:30 -0700)]
am
40b207c1: Merge "Using proper key for removing object from the map."
* commit '
40b207c131e224554e30cde30fe4ee49817432ee':
Using proper key for removing object from the map.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:29:56 +0000 (11:29 -0700)]
am
b37f7e59: Merge changes I81fc2f90,I5e7fd759
* commit '
b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
Using proper key for removing from map.
Removing wrong equals method in comparator.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:03:29 +0000 (11:03 -0700)]
Merge "Fixing improper boxing to Integer instead of Long."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:00:51 +0000 (11:00 -0700)]
Merge "Using proper key for removing object from the map."
Brad Fitzpatrick [Tue, 15 Mar 2011 17:56:16 +0000 (10:56 -0700)]
Merge changes I81fc2f90,I5e7fd759
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
Dianne Hackborn [Tue, 15 Mar 2011 17:52:27 +0000 (10:52 -0700)]
am
44220a56: Merge "Add some debug code to try to track down issue
3183612" into gingerbread
* commit '
44220a56026ead4583a9db96ced5f1113d4b4f07':
Add some debug code to try to track down issue
3183612
Dianne Hackborn [Tue, 15 Mar 2011 17:29:04 +0000 (10:29 -0700)]
Merge "Add some debug code to try to track down issue
3183612" into gingerbread
Dianne Hackborn [Mon, 14 Mar 2011 21:24:04 +0000 (14:24 -0700)]
Add some debug code to try to track down issue
3183612
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253
Ying Wang [Mon, 14 Mar 2011 20:45:34 +0000 (13:45 -0700)]
am
bf079216: Dist classes.jar with full class files inside
* commit '
bf079216c607b660a0ad219df6c4752906a7fc61':
Dist classes.jar with full class files inside
Mike Lockwood [Mon, 14 Mar 2011 20:37:54 +0000 (13:37 -0700)]
am
78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit '
78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
DO NOT MERGE: backport recent USB accessory changes from honeycomb
Ying Wang [Mon, 14 Mar 2011 20:35:59 +0000 (13:35 -0700)]
Dist classes.jar with full class files inside
Instead of the final jar with classes.dex inside.
Change-Id: I2bc7eb6faedf328a93a6e2eacc4334d87761f597
Simon Wilson [Mon, 14 Mar 2011 20:34:18 +0000 (13:34 -0700)]
am
ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit '
ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
DO NOT MERGE Support WiMAX Settings & ticker message
Daniel Sandler [Mon, 14 Mar 2011 20:34:08 +0000 (13:34 -0700)]
am
45660662: Merge "Workaround unknown ERI indices." into gingerbread
* commit '
45660662e61e8cc3ff13144668767a86d1d5b7f4':
Workaround unknown ERI indices.
Mike Lockwood [Mon, 14 Mar 2011 20:17:24 +0000 (13:17 -0700)]
Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
Gilles Debunne [Mon, 14 Mar 2011 19:57:01 +0000 (12:57 -0700)]
resolved conflicts for merge of
9c06c0ff to gingerbread-plus-aosp
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
Simon Wilson [Mon, 14 Mar 2011 18:40:17 +0000 (11:40 -0700)]
Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
TK MUN [Fri, 11 Mar 2011 23:59:43 +0000 (08:59 +0900)]
DO NOT MERGE Support WiMAX Settings & ticker message
Change to save UI setting value
Add new Icons for ticker message
Change-Id: I3294f40c9853311f74877e197675f48bf271d468
Daniel Sandler [Mon, 14 Mar 2011 18:37:12 +0000 (11:37 -0700)]
Merge "Workaround unknown ERI indices." into gingerbread
Daniel Sandler [Fri, 11 Mar 2011 14:25:36 +0000 (09:25 -0500)]
Workaround unknown ERI indices.
Bug:
4075878
Change-Id: I18b793ebccbd1332e3e153acca34056d26bf10a0
Gilles Debunne [Mon, 14 Mar 2011 18:30:17 +0000 (11:30 -0700)]
Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread
Mike Lockwood [Sat, 12 Mar 2011 01:00:53 +0000 (20:00 -0500)]
DO NOT MERGE: backport recent USB accessory changes from honeycomb
Bug:
4082651
Change-Id: Ie7c2fc796dd3c64f803acbd14210e5949683f4ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
Kenny Root [Fri, 11 Mar 2011 23:45:34 +0000 (15:45 -0800)]
am
2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '
2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
Remove unnecessary SkImageDecoder_libjpeg.cpp
James Dong [Fri, 11 Mar 2011 22:31:37 +0000 (14:31 -0800)]
am
68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '
68f66b945e7a69549689becd2e656d9056f1e7f5':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
Kenny Root [Fri, 11 Mar 2011 22:22:22 +0000 (14:22 -0800)]
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
James Dong [Fri, 11 Mar 2011 21:38:02 +0000 (13:38 -0800)]
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
Ying Wang [Fri, 11 Mar 2011 20:05:22 +0000 (12:05 -0800)]
am
69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread
* commit '
69e725eb8806180749b66903382754c86a15d0f6':
Dist com.android.nfc_extras.jar.
Robert Greenwalt [Fri, 11 Mar 2011 19:52:31 +0000 (11:52 -0800)]
am
b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
* commit '
b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
DO NOT MERGE Backport of I1f55df8a from master.
James Dong [Fri, 11 Mar 2011 19:02:17 +0000 (11:02 -0800)]
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
cherry-picked the following patches from HC branch:
o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits
o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode
o When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.
o Speed up MP3Extractor using cached reads
bug -
4083532
Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
Ying Wang [Fri, 11 Mar 2011 18:17:49 +0000 (10:17 -0800)]
Merge "Dist com.android.nfc_extras.jar." into gingerbread
Robert Greenwalt [Fri, 11 Mar 2011 18:14:28 +0000 (10:14 -0800)]
Merge "DO NOT MERGE Backport of I1f55df8a from " into gingerbread
Ying Wang [Fri, 11 Mar 2011 02:04:54 +0000 (18:04 -0800)]
Dist com.android.nfc_extras.jar.
Change-Id: I409106d641a3a68ef1c6885b36d226411c8fe356
Robert Greenwalt [Fri, 11 Mar 2011 00:58:31 +0000 (16:58 -0800)]
DO NOT MERGE Backport of I1f55df8a from master.
Fixes false reporting of NO_CONNECTION.
bug:
4057115
Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
Nick Pelly [Fri, 11 Mar 2011 00:32:28 +0000 (16:32 -0800)]
am
367f41f8: Implement new NFC-EE API\'s as shared library (frameworks/base).
* commit '
367f41f8f61126c2ab34a34cc676756a9fc23ac2':
Implement new NFC-EE API's as shared library (frameworks/base).
Nick Pelly [Tue, 8 Mar 2011 19:43:30 +0000 (11:43 -0800)]
Implement new NFC-EE API's as shared library (frameworks/base).
Change-Id: I45c4eaf59ec78167fc236fdd59676465a5e1bcb7
Robert Greenwalt [Thu, 10 Mar 2011 19:59:17 +0000 (11:59 -0800)]
am
dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread
* commit '
dfcb8c511635431d536fd3ef1894378f4424ef1a':
Don't accept a user-defined dun-capable connection
Robert Greenwalt [Thu, 10 Mar 2011 18:41:36 +0000 (10:41 -0800)]
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
Chih-Wei Huang [Thu, 10 Mar 2011 09:49:03 +0000 (17:49 +0800)]
Remove unnecessary SkImageDecoder_libjpeg.cpp
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's
out/target/external/skia/src/images/SkImageDecoder_libjpeg.o
It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.
Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.
Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
TK MUN [Thu, 10 Mar 2011 06:54:44 +0000 (22:54 -0800)]
am
4bdab175: DO NOT MERGE WiMAX support
* commit '
4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
DO NOT MERGE WiMAX support
TK MUN [Wed, 23 Feb 2011 09:55:55 +0000 (18:55 +0900)]
DO NOT MERGE WiMAX support
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX
Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
Mathias Agopian [Thu, 10 Mar 2011 01:11:10 +0000 (17:11 -0800)]
am
33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit '
33029221619f14577bd0d0e7c2f815abc8f1b8ea':
revert the surface purgatory list and dependent changes.
Mathias Agopian [Thu, 10 Mar 2011 01:07:27 +0000 (17:07 -0800)]
Merge "revert the surface purgatory list and dependent changes." into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 00:13:31 +0000 (16:13 -0800)]
revert the surface purgatory list and dependent changes.
6d0f6cb Revert "Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only"
6154412 Revert "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)"
37c2a37 fix [
3408713] Dialog window invisible sometimes
It looks like there is a surface leak, it's unclear where it is.
Without those reverts, this would cause a leak of the associated buffers
which is far more problematic. this change might hide the surface leak.
Bug:
4078032
Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
Mathias Agopian [Thu, 10 Mar 2011 00:57:32 +0000 (16:57 -0800)]
am
b710a50a: Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
* commit '
b710a50ab6ca36b502f548e8551f620e98bbb1d8':
fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
Mathias Agopian [Thu, 10 Mar 2011 00:57:28 +0000 (16:57 -0800)]
am
c05d35db: Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
* commit '
c05d35db1c57de97888f16ed74718e4c676e4a9b':
fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
Mathias Agopian [Thu, 10 Mar 2011 00:54:21 +0000 (16:54 -0800)]
Merge "fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread
Mathias Agopian [Thu, 10 Mar 2011 00:54:14 +0000 (16:54 -0800)]
Merge "fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread
Robert Greenwalt [Wed, 9 Mar 2011 23:08:15 +0000 (15:08 -0800)]
Don't accept a user-defined dun-capable connection
If we're asked to connect to a DUN APN and we have a carrier specified
DUN APN setting, verify what we're connected to is the same as what the
carrier specified before accepting it.
bug:
4048013
Change-Id: I91edc4a1342cb40c1f6959e149303b7d76710f96
Lorenzo Colitti [Wed, 9 Mar 2011 23:09:20 +0000 (15:09 -0800)]
am
bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.
* commit '
bd0e806a61df9b67890dc3b1390db554e7468b4a':
Support IPv6->IPv4 fallback in HTTP streaming.
Lorenzo Colitti [Wed, 9 Mar 2011 23:09:04 +0000 (15:09 -0800)]
am
b9da16a1: Support IPv6 in HTTP streaming.
* commit '
b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
Lorenzo Colitti [Fri, 4 Feb 2011 00:41:34 +0000 (16:41 -0800)]
Support IPv6->IPv4 fallback in HTTP streaming.
Bug:
4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
Lorenzo Colitti [Tue, 4 Jan 2011 00:10:34 +0000 (16:10 -0800)]
Support IPv6 in HTTP streaming.
Bug:
4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
Mathias Agopian [Tue, 8 Mar 2011 02:04:06 +0000 (18:04 -0800)]
am
df6410dc: Merge "Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
* commit '
df6410dce3dae0bdb7e13118b3878079a1dcce03':
Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only
Mathias Agopian [Tue, 8 Mar 2011 02:00:20 +0000 (18:00 -0800)]
Merge "Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
Mathias Agopian [Tue, 15 Feb 2011 00:34:07 +0000 (16:34 -0800)]
fix [
3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]
make sure to not pass negative numbers to sqrt().
Change-Id: Ia31f7ebb7b75c79b548e428c6084fa55031617d0
related-bug:
3452750
Mathias Agopian [Tue, 8 Mar 2011 01:49:54 +0000 (17:49 -0800)]
fix [
4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]
Just make sure to clamp the argument to zero.
Bug:
4026375
Change-Id: Idd3d4ef977e87c1b3f6b54371105c3152d7dc6b9
Mathias Agopian [Thu, 10 Feb 2011 02:38:55 +0000 (18:38 -0800)]
Fix [
3513017] in lockscreen but showing empty launcher (live wallpaper) only
37c2a37 fix [
3408713] Dialog window invisible sometimes
d35c666 fix [
3385504] Surface flinger hang when adding dim surface
1723b04 fix [
3389263] OMX.Nvidia.h264.decode fails to shutdown
1b0114f fix a surface leak in SurfaceFlinger
Bug:
3513017
Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
Simon Wilson [Mon, 7 Mar 2011 23:42:59 +0000 (15:42 -0800)]
am
6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
* commit '
6b6869d5c1a203e79dc272f2f0e53c184f44f24a':
mms: mms wap push length check before pdu processing.
Simon Wilson [Mon, 7 Mar 2011 23:39:19 +0000 (15:39 -0800)]
Merge "mms: mms wap push length check before pdu processing." into gingerbread
Soojung Shin [Mon, 7 Mar 2011 04:43:27 +0000 (20:43 -0800)]
mms: mms wap push length check before pdu processing.
Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
James Dong [Mon, 7 Mar 2011 23:10:26 +0000 (15:10 -0800)]
am
d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
* commit '
d581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
James Dong [Mon, 7 Mar 2011 22:48:58 +0000 (14:48 -0800)]
Add missing copyright headers for a couple of files. DO NOT MERGE
Cherry-picked from other branch...
bug -
4025673
Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
Soojung Shin [Sat, 5 Mar 2011 01:16:49 +0000 (17:16 -0800)]
am
ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
* commit '
ff5a09904fb05f2776f1bbf1dd3915f38031190c':
Added to check for supporting mms content-disposition, utf8 decoding.
Soojung Shin [Wed, 2 Mar 2011 00:39:35 +0000 (09:39 +0900)]
Added to check for supporting mms content-disposition, utf8 decoding.
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
Lorenzo Colitti [Fri, 4 Mar 2011 01:07:56 +0000 (17:07 -0800)]
am
b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
* commit '
b028ce55cac88f1778cdad59c63c52a5b66afb69':
Add a protocol property to the APNs and use it.
Lorenzo Colitti [Fri, 4 Mar 2011 01:07:50 +0000 (17:07 -0800)]
am
6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
* commit '
6987036fabbd2c0351986efcfd11e714ae75fdf8':
Make setupDataCall take a protocol parameter.
Lorenzo Colitti [Fri, 4 Mar 2011 01:04:07 +0000 (17:04 -0800)]
Merge "Add a protocol property to the APNs and use it." into gingerbread
Lorenzo Colitti [Fri, 4 Mar 2011 01:03:58 +0000 (17:03 -0800)]
Merge "Make setupDataCall take a protocol parameter." into gingerbread
Jeff Brown [Thu, 3 Mar 2011 23:03:26 +0000 (15:03 -0800)]
am
e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
* commit '
e23c235c662c3028cfb080c6ed60d7defcdd0b69':
Only set KeyEvent long press flag when repeat count equals 1.
Jeff Brown [Thu, 3 Mar 2011 22:42:14 +0000 (14:42 -0800)]
Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
Jozef BABJAK [Mon, 21 Feb 2011 14:55:01 +0000 (15:55 +0100)]
Fixing improper boxing to Integer instead of Long.
This is tricky: entry.getMessageBox() returns int, so it is
by default boxed to Integer. Map.get() however accepts Objects,
so it ignores the difference, but nothing is find during lookup,
just because Long and Integer objects are compared using equals(),
which has to lead to 'false' result. So, explicit boxning to Long
is unnecessary here.
Change-Id: I967a7829a8926410a00274c6b5e312e1af567299
Mike Lockwood [Thu, 3 Mar 2011 06:07:59 +0000 (22:07 -0800)]
am
611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
* commit '
611af238185cf924a425a1a2154b8439b8f8d7a5':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
Mike Lockwood [Thu, 3 Mar 2011 05:53:39 +0000 (21:53 -0800)]
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
Change-Id: I1aa578887e42aef375211eadece4c1fddaf234f8
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Brown [Thu, 3 Mar 2011 04:49:06 +0000 (20:49 -0800)]
Only set KeyEvent long press flag when repeat count equals 1.
This fixes a Gingerbread regression.
Bug:
3507021
Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
Mike Lockwood [Thu, 3 Mar 2011 02:32:08 +0000 (18:32 -0800)]
am
c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
* commit '
c9ac3f5183be3f124f34ed49ac5766e0ba1aff77':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
Mike Lockwood [Thu, 3 Mar 2011 02:27:33 +0000 (18:27 -0800)]
Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
Mike Lockwood [Thu, 3 Mar 2011 01:58:48 +0000 (17:58 -0800)]
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
BUG:
3493041
Change-Id: I6aeb00a1d91d98a5a0aef4ed97ca5ba68daa24be
Signed-off-by: Mike Lockwood <lockwood@android.com>
Simon Wilson [Thu, 3 Mar 2011 02:10:33 +0000 (18:10 -0800)]
am
edc68a00: Merge "Attempt to reduce problems from issue #
3183612" into gingerbread
* commit '
edc68a001cd94d2011029004cb27231432a18575':
Attempt to reduce problems from issue #
3183612
Simon Wilson [Thu, 3 Mar 2011 02:03:52 +0000 (18:03 -0800)]
Merge "Attempt to reduce problems from issue #
3183612" into gingerbread
Mike Lockwood [Wed, 2 Mar 2011 23:38:55 +0000 (15:38 -0800)]
am
1110748b: DO NOT MERGE: USB accessory support library
* commit '
1110748b2df664f9c5066819c1f0616eae3394a7':
DO NOT MERGE: USB accessory support library
Mike Lockwood [Wed, 2 Mar 2011 06:55:51 +0000 (22:55 -0800)]
DO NOT MERGE: USB accessory support library
This provides a mechanism for developing applications to work with
USB accessories in versions of android prior to the introduction
of the android.hardware.UsbManager APIs.
Applications should link against the com.android.future.usb.accessory
library to use this support.
Change-Id: I0b61e20b63eec42c506f0895a0c9a439bdfdf7f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 2 Mar 2011 23:16:32 +0000 (15:16 -0800)]
am
40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
* commit '
40bbf9295d5245d3917629ce15f7b37670aef1ac':
DO NOT MERGE: Backport USB accessory support to gingerbread
Mike Lockwood [Tue, 1 Mar 2011 18:23:48 +0000 (10:23 -0800)]
DO NOT MERGE: Backport USB accessory support to gingerbread
Signed-off-by: Mike Lockwood <lockwood@android.com>
Costin Manolache [Tue, 1 Mar 2011 20:29:40 +0000 (12:29 -0800)]
am
db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit '
db52ab69f22e24615eaa2e8f9845e157426d3dd6':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
Costin Manolache [Tue, 1 Mar 2011 20:25:21 +0000 (12:25 -0800)]
Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
Costin Manolache [Thu, 24 Feb 2011 18:28:47 +0000 (10:28 -0800)]
DO NOT MERGE
Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
This is backward compatible - both new and old authenticators will work with old and new framework,
but the functionality will only be present if both sides support it.
Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
Dianne Hackborn [Tue, 1 Mar 2011 02:06:46 +0000 (18:06 -0800)]
am
1de4a2ca: am
62619392: Merge "Fix leak when keylock is recreated."
* commit '
1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
Fix leak when keylock is recreated.
Dianne Hackborn [Tue, 1 Mar 2011 02:03:12 +0000 (18:03 -0800)]
am
62619392: Merge "Fix leak when keylock is recreated."
* commit '
626193926df0b3c7236e5c244f30d797d9192e0d':
Fix leak when keylock is recreated.
Dianne Hackborn [Tue, 1 Mar 2011 01:54:54 +0000 (17:54 -0800)]
Merge "Fix leak when keylock is recreated."
Jaikumar Ganesh [Tue, 1 Mar 2011 00:27:16 +0000 (16:27 -0800)]
am
9711b9b7: am
1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '
9711b9b7aa7448b44b85fe8158ded0364cc3540e':
Phone crash when old callback func is woken up when enabling BT.
Jaikumar Ganesh [Tue, 1 Mar 2011 00:00:01 +0000 (16:00 -0800)]
am
1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '
1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
Phone crash when old callback func is woken up when enabling BT.
Jaikumar Ganesh [Mon, 28 Feb 2011 23:33:34 +0000 (15:33 -0800)]
Merge "Phone crash when old callback func is woken up when enabling BT."
Mike Lockwood [Mon, 28 Feb 2011 21:18:06 +0000 (13:18 -0800)]
am
61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
* commit '
61c1bb4fef439650a3b88131c6e1360ffc03a7ed':
UsbService: Remove stack-trace message during boot. DO NOT MERGE
Mike Lockwood [Mon, 28 Feb 2011 21:18:02 +0000 (13:18 -0800)]
am
6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
* commit '
6da062a96c6f8126aad450a937144fab4333488f':
DO NOT MERGE: Clean up USB notifications:
Mike Lockwood [Mon, 28 Feb 2011 21:17:58 +0000 (13:17 -0800)]
am
3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
* commit '
3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
DO NOT MERGE UsbManager: squashed commit of:
Mike Lockwood [Mon, 28 Feb 2011 21:17:54 +0000 (13:17 -0800)]
am
f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
* commit '
f7b99b32ad7a4872376355acabb5984142ba5e75':
Give system server permission to access USB. DO NOT MERGE
Mike Lockwood [Mon, 28 Feb 2011 21:12:11 +0000 (13:12 -0800)]
Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:12:03 +0000 (13:12 -0800)]
Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:11:55 +0000 (13:11 -0800)]
Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
Mike Lockwood [Mon, 28 Feb 2011 21:11:37 +0000 (13:11 -0800)]
Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread