OSDN Git Service
Brad Fitzpatrick [Tue, 29 Mar 2011 16:27:16 +0000 (09:27 -0700)]
am
1e7fb7ae: Merge "Error in compound cache-control header."
* commit '
1e7fb7aed7b00cebc8f0e501c911727af6527523':
Error in compound cache-control header.
Brad Fitzpatrick [Tue, 29 Mar 2011 15:55:02 +0000 (08:55 -0700)]
Merge "Error in compound cache-control header."
Henrik Baard [Mon, 16 Aug 2010 11:18:10 +0000 (13:18 +0200)]
Error in compound cache-control header.
A cache control header containing both no-cache and max-age attribute does not
behave as expected.
Cache-Control: no-cache, max-age=200000
Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.
Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
Brad Fitzpatrick [Mon, 28 Mar 2011 15:26:02 +0000 (08:26 -0700)]
am
f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit '
f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
Brad Fitzpatrick [Mon, 28 Mar 2011 15:15:35 +0000 (08:15 -0700)]
am
1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '
1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
Unregister callback from binder when vibration is removed
Brad Fitzpatrick [Mon, 28 Mar 2011 15:13:08 +0000 (08:13 -0700)]
Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
Brad Fitzpatrick [Mon, 28 Mar 2011 14:59:08 +0000 (07:59 -0700)]
Merge "Unregister callback from binder when vibration is removed"
Christer Fletcher [Mon, 21 Mar 2011 14:56:27 +0000 (15:56 +0100)]
Handle OutOfMemoryError when decoding images in ThumbnailUtils
Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.
Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
Jeff Hamilton [Fri, 25 Mar 2011 03:21:41 +0000 (20:21 -0700)]
am
9c1ef098: Update the value for the NFC shared UID.
* commit '
9c1ef098837bd73044cb970545344dd03f66daa0':
Update the value for the NFC shared UID.
Jeff Hamilton [Fri, 25 Mar 2011 02:39:58 +0000 (21:39 -0500)]
Update the value for the NFC shared UID.
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
Bart Sears [Thu, 24 Mar 2011 10:36:31 +0000 (03:36 -0700)]
am
6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '
6a19759c0fae744e80c032ca3c23932e73e6d9d9':
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
Huahui Wu [Thu, 24 Mar 2011 10:35:59 +0000 (03:35 -0700)]
Mathias Jeppsson [Tue, 28 Sep 2010 12:45:23 +0000 (14:45 +0200)]
Unregister callback from binder when vibration is removed
When creating new vibration pattern, a callback is registered
in case binding to caller goes away, by linkToDeath().
Need to unregister this callback when we throw away the vibration.
Change-Id: Ibdf0bd415a539054ac7a66f49b33a864f729c546
Bart Sears [Thu, 24 Mar 2011 01:20:45 +0000 (18:20 -0700)]
Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
Update Droid Fonts
DroidSans-Bold.ttf
DroidSans.ttf
DroidSansMono.ttf
DroidSerif-Bold.ttf
DroidSerif-BoldItalic.ttf
DroidSerif-Italic.ttf
DroidSerif-Regular.ttf
- Fix the Tcedilla glyphs
DroidSansFallback
- Add Dingbat Symbols
- Add Currency Symbols
- Add International Phonetic Alphabet (IPA)
- Add U+02BB Modifier letter turned comma
- Add U+2011 Non-breaking hyphen
DroidSansArabic.ttf
- Updated Arabic font
- Added support for initial and medial forms of Persian (Farsi) yeh (glyphs U+FBFE and U+FBFF)
Bug:
4167128
Change-Id: Iec3e5b20c6dd54ff7cc5bef51dd5a05179d8d5a8
Brad Fitzpatrick [Wed, 23 Mar 2011 19:44:23 +0000 (12:44 -0700)]
am
2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '
2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
Making it possible to call SIP calls with special allowed chars.
Brad Fitzpatrick [Wed, 23 Mar 2011 19:44:18 +0000 (12:44 -0700)]
am
5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit '
5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7':
Fixing the wrong link in YuvImage JavaDoc.
Brad Fitzpatrick [Wed, 23 Mar 2011 19:33:39 +0000 (12:33 -0700)]
Merge "Making it possible to call SIP calls with special allowed chars."
Brad Fitzpatrick [Wed, 23 Mar 2011 19:30:28 +0000 (12:30 -0700)]
Merge "Fixing the wrong link in YuvImage JavaDoc."
Huahui Wu [Tue, 22 Mar 2011 22:03:31 +0000 (15:03 -0700)]
DO NOT MERGE
b/
4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread
It's a manual cherrypick of
https://android-git.corp.google.com/g/#change,87278
since a lot has been changed in bettween.
Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
Nick Pelly [Tue, 22 Mar 2011 17:14:36 +0000 (10:14 -0700)]
am
e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit '
e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
NfcAdapterExtras: reset singleton state if initialization fails.
Nick Pelly [Tue, 22 Mar 2011 16:52:55 +0000 (09:52 -0700)]
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
Magnus Strandberg [Tue, 22 Mar 2011 07:03:58 +0000 (08:03 +0100)]
Making it possible to call SIP calls with special allowed chars.
Since String.replaceFirst uses regex and since SIP user names are
allowed to include regex charaters such as '+', the code must
fist convert the string to a literal pattern String before using
replaceFirst method.
Change-Id: I25eac852bd620724ca1c5b2befc023af9dae3c1a
Simon Wilson [Tue, 22 Mar 2011 01:02:57 +0000 (18:02 -0700)]
am
1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
* commit '
1ba4897e89fc30042a086b26755dfdb80af258dd':
DO NOT MERGE Change WiMAX indicator display
Simon Wilson [Mon, 21 Mar 2011 23:58:41 +0000 (16:58 -0700)]
Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
TK MUN [Fri, 18 Mar 2011 08:15:17 +0000 (17:15 +0900)]
DO NOT MERGE Change WiMAX indicator display
Change WiMAX indicator display from data to signal indication
and add a new icon set.
Change-Id: I610f186e07f3d7af9e64bcbdd750371164ac51f5
mike wakerly [Mon, 21 Mar 2011 23:51:06 +0000 (16:51 -0700)]
NfcAdapterExtras: reset singleton state if initialization fails.
Change-Id: I9c319925008070cc5ea93d5dd3941c9396072a8c
Fred Quintana [Mon, 21 Mar 2011 18:33:34 +0000 (11:33 -0700)]
am
661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
* commit '
661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
remove the code that clears the passwords when the sim is replaced with a different one.
Fred Quintana [Mon, 21 Mar 2011 18:04:23 +0000 (11:04 -0700)]
Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
Mike Lockwood [Mon, 21 Mar 2011 00:37:33 +0000 (17:37 -0700)]
am
65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
* commit '
65de3c76874386a5c1ffd26690451ecdef972a9e':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Mike Lockwood [Sat, 19 Mar 2011 16:03:46 +0000 (12:03 -0400)]
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
Bug:
4129297
Change-Id: I33963b0a667976d8100a60b27d66bfd0d57373e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Fischer [Fri, 18 Mar 2011 23:06:41 +0000 (16:06 -0700)]
am
c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:22:05 +0000 (15:22 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 18 Mar 2011 22:10:32 +0000 (15:10 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I48a01203c2db75bc6a1c6dc251264780d845443d
Valentin Kravtsov [Fri, 18 Mar 2011 16:04:33 +0000 (09:04 -0700)]
am
125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
* commit '
125be9c85a3bf71add2841d4195905c1e681a83e':
Fixing a race condition in RecognitionService
Valentin Kravtsov [Fri, 18 Mar 2011 15:49:51 +0000 (08:49 -0700)]
Merge "Fixing a race condition in RecognitionService" into gingerbread
Xia Wang [Thu, 17 Mar 2011 23:21:28 +0000 (16:21 -0700)]
am
e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
* commit '
e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
Port wi-fi stress test into GB DO NOT MERGE
Xavier Ducrohet [Thu, 17 Mar 2011 23:21:20 +0000 (16:21 -0700)]
am
c7c8c599: Merge
67450db0 from honeycomb. Do not merge.
* commit '
c7c8c599a636a105db0d2eac3b8b332532a7a40f':
Merge
67450db0 from honeycomb. Do not merge.
Mike Lockwood [Thu, 17 Mar 2011 23:20:56 +0000 (16:20 -0700)]
am
5982bf66: GPS: Restore XTRA downloading at boot.
* commit '
5982bf66d4fdea38105d91ff0f9d38660ac87581':
GPS: Restore XTRA downloading at boot.
Simon Wilson [Thu, 17 Mar 2011 23:20:46 +0000 (16:20 -0700)]
am
3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
* commit '
3f5995da76541443b7c071bd3acad7590ba222ec':
DO NOT MERGE Add images to ERI icon list
Mike Lockwood [Thu, 17 Mar 2011 23:20:32 +0000 (16:20 -0700)]
am
27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
* commit '
27d9fb57168da5b5c1385df5f0c493cf8339933f':
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
Xia Wang [Thu, 17 Mar 2011 22:06:40 +0000 (15:06 -0700)]
Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
Xavier Ducrohet [Thu, 17 Mar 2011 21:11:23 +0000 (14:11 -0700)]
Merge
67450db0 from honeycomb. Do not merge.
Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
Mike Lockwood [Thu, 17 Mar 2011 18:08:01 +0000 (14:08 -0400)]
GPS: Restore XTRA downloading at boot.
Between Froyo and Gingerbread we disabled scheduling an XTRA data download
at boot because the Qualcomm engineers thought it should not be necessary.
However, some users noticed a GPS performance degradation after receiving
their Gingerbread update, and some reported forcing an XTRA download cleared
up the problem. This change restores the Froyo behavior of downloading
XTRA data after boot.
Bug:
3509901
Change-Id: I5a52201a2b24ce4a5d3ddb1f86340e3d5387f603
Signed-off-by: Mike Lockwood <lockwood@android.com>
Brad Fitzpatrick [Thu, 17 Mar 2011 17:18:15 +0000 (10:18 -0700)]
am
d973bed3: Merge "Removing dead store; it was likely a relict of debuging code."
* commit '
d973bed36cb4d4da1d97f309119f4114f60e7171':
Removing dead store; it was likely a relict of debuging code.
Brad Fitzpatrick [Thu, 17 Mar 2011 16:51:47 +0000 (09:51 -0700)]
Merge "Removing dead store; it was likely a relict of debuging code."
Jozef BABJAK [Tue, 22 Feb 2011 08:48:18 +0000 (09:48 +0100)]
Removing dead store; it was likely a relict of debuging code.
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
Xia Wang [Thu, 10 Mar 2011 00:17:53 +0000 (16:17 -0800)]
Port wi-fi stress test into GB
DO NOT MERGE
Change-Id: Ia79ba42f956481b945e101ccfb66752915a6688d
Simon Wilson [Thu, 17 Mar 2011 02:51:07 +0000 (19:51 -0700)]
Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
sy310.choi [Wed, 16 Mar 2011 05:35:57 +0000 (14:35 +0900)]
DO NOT MERGE Add images to ERI icon list
Add images to 'sRoamingIndicatorImages_cdma' array.
Change-Id: Ie8fb8162219aa5e7140359daf1d64c92a3c0f769
Signed-off-by: sy310.choi <sy310.choi@samsung.com>
Mike Lockwood [Wed, 16 Mar 2011 18:10:03 +0000 (14:10 -0400)]
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
Change-Id: I642a38d3e541b3d531eed1a00708f6864d8cab4c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dianne Hackborn [Tue, 15 Mar 2011 21:49:45 +0000 (14:49 -0700)]
am
7c2e76f0: Merge "Improve error reporting for issue #
3183612" into gingerbread
* commit '
7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #
3183612
Mike Lockwood [Tue, 15 Mar 2011 21:49:37 +0000 (14:49 -0700)]
am
b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit '
b09763209980ff9210cc353f2410598220ec0480':
DO NOT MERGE: Backport more USB accessory changes from honeycomb
Dianne Hackborn [Tue, 15 Mar 2011 21:40:56 +0000 (14:40 -0700)]
Merge "Improve error reporting for issue #
3183612" into gingerbread
Dianne Hackborn [Tue, 15 Mar 2011 21:38:02 +0000 (14:38 -0700)]
Improve error reporting for issue #
3183612
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
Mike Lockwood [Tue, 15 Mar 2011 21:04:54 +0000 (14:04 -0700)]
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
Mike Lockwood [Tue, 15 Mar 2011 01:56:33 +0000 (21:56 -0400)]
DO NOT MERGE: Backport more USB accessory changes from honeycomb
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
Xavier Ducrohet [Tue, 15 Mar 2011 18:41:13 +0000 (11:41 -0700)]
am
0a98226e: Merge
9d76581f from honeycomb. do not merge.
* commit '
0a98226e3c8cda46786558147a0eb6a56c3370c0':
Merge
9d76581f from honeycomb. do not merge.
Xavier Ducrohet [Tue, 15 Mar 2011 18:41:10 +0000 (11:41 -0700)]
am
b243aabd: Merge
adaa12cd from honeycomb. do not merge.
* commit '
b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
Merge
adaa12cd from honeycomb. do not merge.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:37 +0000 (11:37 -0700)]
am
8d25eab1: Merge "Releasing lock even if exception is thrown."
* commit '
8d25eab10523ac2424dc645dc697126dbadad588':
Releasing lock even if exception is thrown.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:32 +0000 (11:37 -0700)]
am
56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
* commit '
56c4c442c0309aa91958dee6b6ed2d65db7ba17d':
Lazy initialization must be synchronized to avoid parallel instances cretation.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:29 +0000 (11:37 -0700)]
am
b98c8fca: Merge "Removing self-assignment statement."
* commit '
b98c8fca954718cb61d6513e623a78f1b0bd0edb':
Removing self-assignment statement.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:37:25 +0000 (11:37 -0700)]
am
8b5345fb: Merge "Fixing self-assignment in copying code."
* commit '
8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
Fixing self-assignment in copying code.
Xavier Ducrohet [Tue, 15 Mar 2011 18:37:01 +0000 (11:37 -0700)]
am
48a2a5ad: Merge "Merge
6f2fb570 from honeycomb. do not merge." into gingerbread
* commit '
48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
Merge
6f2fb570 from honeycomb. do not merge.
Xavier Ducrohet [Tue, 15 Mar 2011 18:36:57 +0000 (11:36 -0700)]
am
14e1f523: Merge "Merge
c12b4093 from honeycomb. do not merge." into gingerbread
* commit '
14e1f523c673315cbc3167448ce9252b455d252c':
Merge
c12b4093 from honeycomb. do not merge.
Xavier Ducrohet [Mon, 14 Mar 2011 22:12:21 +0000 (15:12 -0700)]
Merge
9d76581f from honeycomb. do not merge.
LayoutLib: Fix Arc rendering.
Looks like Java2D and Skia go in different directions for angles.
Change-Id: I4d72db56455afe25b4f51f23a9b29d6c438119ba
Xavier Ducrohet [Tue, 8 Mar 2011 19:50:21 +0000 (11:50 -0800)]
Merge
adaa12cd from honeycomb. do not merge.
LayoutLib: fix Capabilities and getDimensionPixelSize
Commented out a Capability that is not in ADT 10.
BridgeTypedArray.getDimensionPixelSize shouldn't call
getDimension since most of the code is duplicated, and
it prevents use from properly detecting malformed attribute
values.
Change-Id: I008334af605a89f240247a13c0024009247ec5af
Brad Fitzpatrick [Tue, 15 Mar 2011 18:33:40 +0000 (11:33 -0700)]
am
9a01a2f2: Merge "Fixing self-assignment in cloning code."
* commit '
9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
Fixing self-assignment in cloning code.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:33:32 +0000 (11:33 -0700)]
am
7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
* commit '
7972e382802348e7914c14507426af450aa7e30c':
Removing repetitive conditional; it simply does nothing except slowing down things.
Brad Fitzpatrick [Tue, 15 Mar 2011 18:33:28 +0000 (11:33 -0700)]
am
38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
* commit '
38c6e31c88dec226271e02fbfed675181ae938b7':
Removing repetitive conditional; it simply does nothing except slowing down things.
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.
Xavier Ducrohet [Tue, 15 Mar 2011 18:29:16 +0000 (11:29 -0700)]
Merge "Merge
6f2fb570 from honeycomb. do not merge." into gingerbread
Xavier Ducrohet [Tue, 15 Mar 2011 18:29:07 +0000 (11:29 -0700)]
Merge "Merge
c12b4093 from honeycomb. do not merge." into gingerbread
Brad Fitzpatrick [Tue, 15 Mar 2011 18:23:44 +0000 (11:23 -0700)]
Merge "Releasing lock even if exception is thrown."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:22:43 +0000 (11:22 -0700)]
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:19:23 +0000 (11:19 -0700)]
Merge "Removing self-assignment statement."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:18:18 +0000 (11:18 -0700)]
Merge "Fixing self-assignment in copying code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:15:19 +0000 (11:15 -0700)]
Merge "Fixing self-assignment in cloning code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:13:01 +0000 (11:13 -0700)]
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:12:15 +0000 (11:12 -0700)]
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
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
Xavier Ducrohet [Tue, 8 Mar 2011 04:50:21 +0000 (20:50 -0800)]
Merge
6f2fb570 from honeycomb. do not merge.
LayoutLib: Fix dimension parsing to handle negative value.
Also make TypedArray.getDimensionPixelSize properly
handle negative values (which are not allowed).
Change-Id: I03ffcef5ab7ec7ef95419566776dcc798845fd88
Xavier Ducrohet [Tue, 8 Mar 2011 04:19:38 +0000 (20:19 -0800)]
Merge
c12b4093 from honeycomb. do not merge.
Change-Id: Icfbb70c097d87bf92415c6f0534346adde4c02fe
LayoutLib: Implement some missing add###() method in Path.
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