OSDN Git Service
Robert Greenwalt [Fri, 25 Mar 2011 16:35:53 +0000 (09:35 -0700)]
Merge "Fix some alt-network issues." into gingerbread
Robert Greenwalt [Fri, 25 Mar 2011 04:41:41 +0000 (21:41 -0700)]
Fix some alt-network issues.
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
it is active.
bug:
4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
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 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
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 16:52:55 +0000 (09:52 -0700)]
Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
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: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 [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 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 15:49:51 +0000 (08:49 -0700)]
Merge "Fixing a race condition in RecognitionService" into gingerbread
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>
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: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 [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
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
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: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
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
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>
James Dong [Fri, 11 Mar 2011 21:38:02 +0000 (13:38 -0800)]
Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
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 [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 18:41:36 +0000 (10:41 -0800)]
Merge "Don't accept a user-defined dun-capable connection" into gingerbread
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: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: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 [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: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: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 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
Fred Quintana [Fri, 25 Feb 2011 18:39:20 +0000 (10:39 -0800)]
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
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: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 22:42:14 +0000 (14:42 -0800)]
Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread
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: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:03:52 +0000 (18:03 -0800)]
Merge "Attempt to reduce problems from issue #
3183612" into gingerbread
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>
Valentin Kravtsov [Fri, 18 Feb 2011 12:57:59 +0000 (12:57 +0000)]
Fixing a race condition in RecognitionService
Bug #
3458256
If an error occurs and simultaneously user cancels the recognition, here is what happens:
1. dispatchCancel() is called since the user requested cancel. It passes the first "if" successfully.
private void dispatchCancel(IRecognitionListener listener) {
if (mCurrentCallback == null) {
if (DBG) Log.d(TAG, "cancel called with no preceding startListening - ignoring");
} else if (mCurrentCallback.mListener.asBinder() != listener.asBinder()) {
Log.w(TAG, "cancel called by client who did not call startListening - ignoring");
} else { // the correct state
RecognitionService.this.onCancel(mCurrentCallback);
mCurrentCallback = null;
if (DBG) Log.d(TAG, "canceling - setting mCurrentCallback to null");
}
}
2. Error occurs in the app, which sets the mCurrentCallback to null:
public void error(int error) throws RemoteException {
mCurrentCallback = null;
mListener.onError(error);
}
3. the second "if" is reached in dispatchCancel()
4. boom
Change-Id: I54cdcc98b495d820a2caead1709d8dee968c461e
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: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
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
Xavier Ducrohet [Mon, 28 Feb 2011 20:24:01 +0000 (12:24 -0800)]
Merge "Merge
1911a6f7 into gingerbread. do not merge." into gingerbread
Lorenzo Colitti [Wed, 29 Dec 2010 17:55:29 +0000 (09:55 -0800)]
Add a protocol property to the APNs and use it.
1. Database changes:
- Add a protocol and a roaming_protocol column to the
carriers table in the telephony provider database.
- Set the protocol and roaming_protocol fields when
creating APN objects from the database.
2. ApnSetting class changes:
- Add protocol and roamingProtocol fields to the
ApnSetting class that encapsulates APN settings within
the framework.
- Add the fields to ApnSetting.toString and support a new
syntax containing the fields in ApnSetting.fromString.
- Add a unit test for ApnSetting.
3. Telephony changes:
- Specify the APN protocol when setting up a data call,
using protocol when not roaming and roaming_protocol
when roaming.
This change depends on #86896 in the telephony provider,
which adds the new column to the database schema on
upgrades.
Bug:
3333633
Change-Id: If3d9ed4c851d0192849df0d64581db03b066e052
Lorenzo Colitti [Thu, 2 Sep 2010 02:41:50 +0000 (19:41 -0700)]
Make setupDataCall take a protocol parameter.
Backport the protocol changes to setupDataCall and its
callers from master. As in master, hardcode IPv4
connectivity for now. When we add the protocol field to
ApnSettings, it will be fetched from there.
Bug:
3333633
Change-Id: I51880bc0ec192cbf964ac7bbd6a4b7d2eed41d27
David 'Digit' Turner [Sun, 16 Jan 2011 23:19:37 +0000 (00:19 +0100)]
UsbService: Remove stack-trace message during boot. DO NOT MERGE
This removes a stack trace message during the boot under emulation.
The observers tried to access a null reference when no USB configuration
is supported by the emulated device. So do not start them in this case.
+ Change a Slog.w into a Slog.i since this is an acceptable condition.
Change-Id: I801f352574716d7868f182bb6e5ee49e5b12e4f1
Mike Lockwood [Sat, 11 Dec 2010 00:19:32 +0000 (16:19 -0800)]
DO NOT MERGE: Clean up USB notifications:
Add support for separate USB connected and configuration events
Include both USB connected/disconnected and configuration state
in USB_STATE Intent
Remove redundant USB_CONNECTED and USB_DISCONNECTED Intents
Now we just have the sticky USB_STATE broadcast
Move USB disconnnect rebouncing from Tethering to UsbService
Change-Id: I1dea480f4b0daf14247cf37c5f2060498882c002
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 27 Jul 2010 22:44:30 +0000 (18:44 -0400)]
DO NOT MERGE UsbManager: squashed commit of:
USB: Add functions for querying if a USB function is supported and enabled.
Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService
Change-Id: I920a211934d993eab8ce744c1cc7b05342389286
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 27 Jul 2010 22:42:44 +0000 (18:42 -0400)]
Give system server permission to access USB. DO NOT MERGE
Change-Id: I8d64bcaf2483eaa8690aef7ee2d1bb8ed9453fbe
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jamie Gennis [Sun, 27 Feb 2011 23:27:22 +0000 (15:27 -0800)]
Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 21:51:26 +0000 (13:51 -0800)]
Merge
1911a6f7 into gingerbread. do not merge.
Change-Id: I6d56644c4ab1a70eb4a6d0d2e5d84ea4aa674041
LayoutLib: move tests to their own project.
Samyeoul Choi [Thu, 24 Feb 2011 19:03:29 +0000 (11:03 -0800)]
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
'*86' which is set now as a default at CDMAPhone.java,
is default voicemail number for Verizon.
For Sprint, we use user's own number for voicemail.
So we add codes in CDMAPhone.java to use
'config_telephony_use_own_number_for_voicemail',
and use config.xml to set this value as false.
Then we overlay Sprint's own config.xml file to
override 'config_telephony_use_own_number_for_voicemail' as a true.
Change-Id: I110914bdfa9a79aaba89d3b80edbcf044e9aabee
Svetoslav Ganov [Fri, 25 Feb 2011 07:56:52 +0000 (23:56 -0800)]
Merge "Use different version of CLDR data in DatePicker" into gingerbread
Jeff Hamilton [Fri, 25 Feb 2011 03:59:52 +0000 (21:59 -0600)]
Support for NDEF on iCODE.
Change-Id: I9ce2ee5e739d34a9047ca494315cbc54b30fefb8
Svetoslav Ganov [Thu, 24 Feb 2011 23:44:59 +0000 (15:44 -0800)]
Use different version of CLDR data in DatePicker
The ICU CLDR data doesn't use the month abbreviations that are
appropriate for the DatePicker, so use the framework copy of the CLDR
data.
Bug:
2641810
Note: cherry-picked from Honeycomb
Change-Id: I3c045dbfb751b8b7ce6361b5a67407206fc64db1
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:58 +0000 (14:44 -0800)]
Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
Xavier Ducrohet [Thu, 24 Feb 2011 22:44:52 +0000 (14:44 -0800)]
Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread
Alon Albert [Thu, 24 Feb 2011 17:20:46 +0000 (09:20 -0800)]
Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=
d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug b/issue?id=
3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread
Xavier Ducrohet [Tue, 8 Feb 2011 05:30:53 +0000 (21:30 -0800)]
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929