30727 Commits

Author SHA1 Message Date
Robert Greenwalt
dfcb8c5116 Merge "Don't accept a user-defined dun-capable connection" into gingerbread 2011-03-10 10:41:36 -08:00
Keiji Ariyama
77359e7af3 Fixing wrong Japanese phone formatter.
http://code.google.com/p/android/issues/detail?id=15383

Adding rules that Japanese number start with 050 and 060.

Change-Id: Id324d7ecfb18b348230a3903b356647045700d80
2011-03-11 03:27:29 +09:00
Chih-Wei Huang
c2d68c9096 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
2011-03-10 17:52:31 +08:00
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f 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>
2011-03-09 22:37:08 -08:00
Mathias Agopian
a15b5290f5 am 33029221: Merge "revert the surface purgatory list and dependent changes." into gingerbread
* commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea':
  revert the surface purgatory list and dependent changes.
2011-03-09 17:11:10 -08:00
Mathias Agopian
3302922161 Merge "revert the surface purgatory list and dependent changes." into gingerbread 2011-03-09 17:07:27 -08:00
Mathias Agopian
cf8b94562c 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
2011-03-09 17:00:41 -08:00
Mathias Agopian
b4341ba697 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]
2011-03-09 16:57:32 -08:00
Mathias Agopian
a7c836ddc0 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]
2011-03-09 16:57:28 -08:00
Mathias Agopian
b710a50ab6 Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external] [DO NOT MERGE]" into gingerbread 2011-03-09 16:54:21 -08:00
Mathias Agopian
c05d35db1c Merge "fix [4026375] SensorManager quaternion functions can call sqrt with a negative number [DO NOT MERGE]" into gingerbread 2011-03-09 16:54:14 -08:00
Robert Greenwalt
4c89b14db4 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
2011-03-09 16:33:33 -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
Lorenzo Colitti
bd0e806a61 Support IPv6->IPv4 fallback in HTTP streaming.
Bug: 4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
2011-03-08 15:01:15 -08:00
Lorenzo Colitti
b9da16a1e3 Support IPv6 in HTTP streaming.
Bug: 4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
2011-03-08 15:01:15 -08:00
Johan Redestig
141c8b5195 Implement support for ALT and SHIFT modifiers
The spec for keymaps and keboard input at
http://source.android.com/porting/keymaps_keyboard_input.html
mentions the stand alone ALT and SHIFT modifiers:

SHIFT: While pressed, the shift key modifier is set
ALT: While pressed, the alt key modifier is set

This commit implements support for these.

Change-Id: I5854ef3df541740cc3443b474a9c41183eb7561c
Ex: key 305   BACK  ALT
2011-03-08 16:27:46 +01:00
Mathias Agopian
de6a47a3e9 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
2011-03-07 18:04:06 -08:00
Mathias Agopian
df6410dce3 Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread 2011-03-07 18:00:20 -08:00
Mathias Agopian
5f94c315a6 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
2011-03-07 17:58:56 -08:00
Mathias Agopian
241d8a84e5 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
2011-03-07 17:58:34 -08:00
Mathias Agopian
951d3fec41 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
2011-03-07 16:56:16 -08:00
Simon Wilson
10993b2d1e 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.
2011-03-07 15:42:59 -08:00
Simon Wilson
6b6869d5c1 Merge "mms: mms wap push length check before pdu processing." into gingerbread 2011-03-07 15:39:19 -08:00
Soojung Shin
7ac1cb787c mms: mms wap push length check before pdu processing.
Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-07 15:37:01 -08:00
James Dong
b1be086e1d 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...
2011-03-07 15:10:26 -08:00
James Dong
d581c04722 Add missing copyright headers for a couple of files. DO NOT MERGE
Cherry-picked from other branch...

bug - 4025673

Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
2011-03-07 14:50:40 -08:00
Fred Quintana
eedb4df195 remove the code that clears the passwords when the sim
is replaced with a different one.

DO NOT MERGE
patched from honeycomb-mr1

Bug: 3404577
Change-Id: If11fc6be817ca1fa3dd5c085ff9696a1c5ea3a03
2011-03-07 11:11:44 -08:00
Soojung Shin
fa680a18f6 am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
  Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-04 17:16:49 -08:00
Soojung Shin
ff5a09904f Added to check for supporting mms content-disposition, utf8 decoding.
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-04 14:32:31 -08:00
Lorenzo Colitti
362da50989 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.
2011-03-03 17:07:56 -08:00
Lorenzo Colitti
ba76f2ac2a am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
* commit '6987036fabbd2c0351986efcfd11e714ae75fdf8':
  Make setupDataCall take a protocol parameter.
2011-03-03 17:07:50 -08:00
Lorenzo Colitti
b028ce55ca Merge "Add a protocol property to the APNs and use it." into gingerbread 2011-03-03 17:04:07 -08:00
Lorenzo Colitti
6987036fab Merge "Make setupDataCall take a protocol parameter." into gingerbread 2011-03-03 17:03:58 -08:00
Jeff Brown
9503e8bc17 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.
2011-03-03 15:03:26 -08:00
Jeff Brown
e23c235c66 Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 2011-03-03 14:42:14 -08:00
Jozef BABJAK
17eb45fff8 Lazy initialization must be synchronized to avoid parallel instances cretation.
Change-Id: I9c6887c714f42534a465c266689dc03ee7298900
2011-03-03 10:22:12 +01:00
Jozef BABJAK
0dbe721d0a 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
2011-03-03 10:09:53 +01:00
Mike Lockwood
d948b85dc9 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
2011-03-02 22:07:59 -08:00
Mike Lockwood
611af23818 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>
2011-03-02 22:00:59 -08:00
Jeff Brown
59fd13c7be Only set KeyEvent long press flag when repeat count equals 1.
This fixes a Gingerbread regression.

Bug: 3507021
Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
2011-03-02 20:49:06 -08:00
Mike Lockwood
e91e5f6e9d 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
2011-03-02 18:32:08 -08:00
Mike Lockwood
c9ac3f5183 Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread 2011-03-02 18:27:33 -08:00
Mike Lockwood
ae0fdf13e2 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>
2011-03-02 18:24:59 -08:00
Simon Wilson
3d79f1ce84 am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread
* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
2011-03-02 18:10:33 -08:00
Simon Wilson
edc68a001c Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -08:00
Mike Lockwood
b13581a9da am 1110748b: DO NOT MERGE: USB accessory support library
* commit '1110748b2df664f9c5066819c1f0616eae3394a7':
  DO NOT MERGE: USB accessory support library
2011-03-02 15:38:55 -08:00
Mike Lockwood
1110748b2d 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>
2011-03-02 15:23:41 -08:00
Mike Lockwood
7866be2b76 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 15:16:32 -08:00