Simon Wilson
03aa986e6b
am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
DO NOT MERGE Change WiMAX indicator display
2011-03-21 18:02:57 -07:00
Simon Wilson
1ba4897e89
Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
2011-03-21 16:58:41 -07:00
TK MUN
081148dd32
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
2011-03-21 16:55:00 -07:00
mike wakerly
0bddf0dcfb
NfcAdapterExtras: reset singleton state if initialization fails.
...
Change-Id: I9c319925008070cc5ea93d5dd3941c9396072a8c
2011-03-21 16:51:06 -07:00
Fred Quintana
17f95e92ed
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.
2011-03-21 11:33:34 -07:00
Fred Quintana
661e9b371f
Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread
2011-03-21 11:04:23 -07:00
Mike Lockwood
9a612b545e
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
2011-03-20 17:37:33 -07:00
Mike Lockwood
65de3c7687
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>
2011-03-19 14:38:54 -04:00
Eric Fischer
9ac8260608
am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
2011-03-18 16:06:41 -07:00
Eric Fischer
c0604255a7
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-18 15:22:05 -07:00
Eric Fischer
3e3f521aed
Import revised translations. DO NOT MERGE
...
Change-Id: I48a01203c2db75bc6a1c6dc251264780d845443d
2011-03-18 15:10:32 -07:00
Valentin Kravtsov
000466d79d
am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '125be9c85a3bf71add2841d4195905c1e681a83e':
Fixing a race condition in RecognitionService
2011-03-18 09:04:33 -07:00
Valentin Kravtsov
125be9c85a
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Xia Wang
01a111486d
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
2011-03-17 16:21:28 -07:00
Xavier Ducrohet
3a90ec4e6b
am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
...
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
Merge 67450db0 from honeycomb. Do not merge.
2011-03-17 16:21:20 -07:00
Mike Lockwood
a5b68f39e2
am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:20:56 -07:00
Simon Wilson
3fa3721e8f
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
2011-03-17 16:20:46 -07:00
Mike Lockwood
af64e751e2
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.
2011-03-17 16:20:32 -07:00
Xia Wang
e12a1a0949
Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
2011-03-17 15:06:40 -07:00
Xavier Ducrohet
c7c8c599a6
Merge 67450db0 from honeycomb. Do not merge.
...
Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
2011-03-17 14:24:50 -07:00
Mike Lockwood
5982bf66d4
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>
2011-03-17 14:08:01 -04:00
Brad Fitzpatrick
b8332786e3
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.
2011-03-17 10:18:15 -07:00
Brad Fitzpatrick
d973bed36c
Merge "Removing dead store; it was likely a relict of debuging code."
2011-03-17 09:51:47 -07:00
Jozef BABJAK
2fb503f510
Using robust equality check.
...
Change-Id: Ie30684c472bfa38d0432f855f7075c34709958d5
2011-03-17 09:54:51 +01:00
Jozef BABJAK
97124117e8
We don't need these local references.
...
Change-Id: I227c88eb4eb5d2842124e1c944cc18d5b28cccc1
2011-03-17 09:43:54 +01:00
Jozef BABJAK
f1aa297b17
Removing dead store; it was likely a relict of debuging code.
...
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
2011-03-17 09:23:32 +01:00
Jozef BABJAK
b74378ab35
Eliminating dead code with no other effect than consuming battery life.
...
Change-Id: I4376902a4e9c301ff16f74137d86eeaff901bbb7
2011-03-17 09:15:43 +01:00
Jozef BABJAK
5a16346395
Removing unnecessary computation.
...
Change-Id: Id201e56fa60baa64204cd204169d119f7b4db3d7
2011-03-17 09:09:10 +01:00
Xia Wang
e9ba454ad8
Port wi-fi stress test into GB
...
DO NOT MERGE
Change-Id: Ia79ba42f956481b945e101ccfb66752915a6688d
2011-03-16 20:25:09 -07:00
Simon Wilson
3f5995da76
Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
2011-03-16 19:51:07 -07:00
sy310.choi
c10571a8ea
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>
2011-03-16 19:45:10 -07:00
Mike Lockwood
27d9fb5716
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
...
Change-Id: I642a38d3e541b3d531eed1a00708f6864d8cab4c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-16 15:04:22 -04:00
Jason parks
4ca74dc4c2
Send out a broadcast that the system is being
...
factory reset.
Change-Id: I339b7ce58cb3f48316103be49b582d4f7e9b63bf
2011-03-16 09:29:47 -05:00
Dianne Hackborn
e2e8da7c73
am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09
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
2011-03-15 14:49:37 -07:00
Dianne Hackborn
7c2e76f0a4
Merge "Improve error reporting for issue #3183612 " into gingerbread
2011-03-15 14:40:56 -07:00
Dianne Hackborn
1ab43775d8
Improve error reporting for issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Mike Lockwood
b097632099
Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
2011-03-15 14:04:54 -07:00
Mike Lockwood
638d7cb3ee
DO NOT MERGE: Backport more USB accessory changes from honeycomb
...
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:50:18 -04:00
Xavier Ducrohet
b7b877a45f
am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
...
* commit '0a98226e3c8cda46786558147a0eb6a56c3370c0':
Merge 9d76581f from honeycomb. do not merge.
2011-03-15 11:41:13 -07:00
Xavier Ducrohet
a82a219a7a
am b243aabd: Merge adaa12cd from honeycomb. do not merge.
...
* commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
Merge adaa12cd from honeycomb. do not merge.
2011-03-15 11:41:10 -07:00
Brad Fitzpatrick
403da3a79a
am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
Releasing lock even if exception is thrown.
2011-03-15 11:37:37 -07:00
Brad Fitzpatrick
a74887e87c
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.
2011-03-15 11:37:32 -07:00
Brad Fitzpatrick
9ac9b28576
am b98c8fca: Merge "Removing self-assignment statement."
...
* commit 'b98c8fca954718cb61d6513e623a78f1b0bd0edb':
Removing self-assignment statement.
2011-03-15 11:37:29 -07:00
Brad Fitzpatrick
b01fc9fb45
am 8b5345fb: Merge "Fixing self-assignment in copying code."
...
* commit '8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
Fixing self-assignment in copying code.
2011-03-15 11:37:25 -07:00
Xavier Ducrohet
f89c37295d
am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
...
* commit '48a2a5ad1b7c4979b1d7baf6add4bc32148a75ae':
Merge 6f2fb570 from honeycomb. do not merge.
2011-03-15 11:37:01 -07:00
Xavier Ducrohet
405cb57019
am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
...
* commit '14e1f523c673315cbc3167448ce9252b455d252c':
Merge c12b4093 from honeycomb. do not merge.
2011-03-15 11:36:57 -07:00
Xavier Ducrohet
0a98226e3c
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
2011-03-15 11:34:19 -07:00
Xavier Ducrohet
b243aabdaf
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
2011-03-15 11:34:18 -07:00
Brad Fitzpatrick
ceae99835e
am 9a01a2f2: Merge "Fixing self-assignment in cloning code."
...
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
Fixing self-assignment in cloning code.
2011-03-15 11:33:40 -07:00