OSDN Git Service
Xavier Ducrohet [Wed, 29 Jun 2011 01:52:59 +0000 (18:52 -0700)]
Merge "CherryPick
988eeeb5 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Wed, 29 Jun 2011 01:52:43 +0000 (18:52 -0700)]
Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
mike wakerly [Tue, 28 Jun 2011 00:29:30 +0000 (17:29 -0700)]
Add intent actions for new firmware events.
Change-Id: I8129b7812c0d551111f0c85eacc9535a441e5453
Jaikumar Ganesh [Tue, 21 Jun 2011 18:23:51 +0000 (11:23 -0700)]
Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
Jaikumar Ganesh [Fri, 17 Jun 2011 04:43:29 +0000 (21:43 -0700)]
DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Change-Id: Ibe267f7cda28ce2a46c25800df2e8ac685b0b9e6
Nick Pelly [Fri, 17 Jun 2011 17:56:39 +0000 (10:56 -0700)]
NFC Adapter Extras API update.
Remove
o registerTearDownApdus()
o deregisterTearDownApdus()
They were already NO-OPS, and don't work in the general case.
Add
o authenticate(byte[] token)
This future proofs us for a more flexible access control scheme.
Change-Id: I4cb67ceeb63d61cbc333c9b244a96d8687402168
Xavier Ducrohet [Wed, 8 Jun 2011 00:03:10 +0000 (17:03 -0700)]
CherryPick
988eeeb5 from hc-mr1. do not merge.
Support for custom declare-styleable attr with enum/flag in layoutlib.
Change-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411
Mathias Agopian [Tue, 14 Jun 2011 18:50:22 +0000 (11:50 -0700)]
DO NOT MERGE. may fix build on some version of gcc
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
Maarten Hooft [Thu, 16 Jun 2011 22:41:20 +0000 (15:41 -0700)]
Merge "Import revised Croatian translations." into gingerbread
Irfan Sheriff [Wed, 15 Jun 2011 16:28:23 +0000 (09:28 -0700)]
Fix lease duration handling
We need to convert lease duration from int to long before
converting into milliseconds
Also add basic sanity check
Bug:
4561231
Change-Id: I9bcafaa798a04c8de3f2c1897dc5b3c4ae245672
Eric Fischer [Wed, 15 Jun 2011 19:10:52 +0000 (12:10 -0700)]
Import revised Croatian translations.
Change-Id: I9fb9bf6796d19e4b419381a0dd398f53bf2e879f
Mathias Agopian [Mon, 13 Jun 2011 01:05:53 +0000 (18:05 -0700)]
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
Bug:
4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
Soojung Shin [Fri, 10 Jun 2011 12:37:23 +0000 (21:37 +0900)]
Ignore duplicate WAP push PDU source/destination port if configured
Some carriers duplicate the OMADM wap push PDU source/destination
port.
e.g. MSGTYPE-TotalSegments-CurrentSegment
-SourcePortDestPort-SourcePortDestPort-OMADM PDU
So the client has to ignore the duplicate source/destination
port.
Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
Dan Morrill [Fri, 10 Jun 2011 17:44:01 +0000 (10:44 -0700)]
Moving flag to a member field instead of a stack variable.
Change-Id: I2b281ec4d424f2c4286fb0bc8db263e3893ad898
Dan Morrill [Thu, 9 Jun 2011 21:43:58 +0000 (14:43 -0700)]
Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread
Marco Nelissen [Thu, 9 Jun 2011 16:39:52 +0000 (09:39 -0700)]
Make sure we don't read from invalid fds
b/
4580570
Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
Dan Morrill [Thu, 9 Jun 2011 04:58:06 +0000 (21:58 -0700)]
Adding a new config value used to tell StatusBarPolicy to always use CDMA
signal strength value even when on EVDO. Default is off, but devices that need
to can override it.
Change-Id: I675af3f3ecfe34a72954ae8241965b0a882edbb8
Mathias Agopian [Wed, 8 Jun 2011 23:05:30 +0000 (16:05 -0700)]
Fix a leak in RefBase (DO NOT MERGE)
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).
Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
Jake Hamby [Fri, 3 Jun 2011 02:52:23 +0000 (19:52 -0700)]
Fixes for SMS Cell Broadcast support.
Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.
Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
Xavier Ducrohet [Sat, 4 Jun 2011 01:53:41 +0000 (18:53 -0700)]
Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
Xavier Ducrohet [Sat, 4 Jun 2011 01:53:23 +0000 (18:53 -0700)]
Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* changes:
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Xavier Ducrohet [Sat, 4 Jun 2011 00:25:48 +0000 (17:25 -0700)]
Cherrypick
d1ed33c4 from hc-mr1. do not merge.
Fix zombie threads in the Layoutlib.
Some widgets can create (indirectly) HandlerThread which are started
but never stopped.
This patch use the delegate methods to override the thread run method
to record which threads are started to be able to call quit() on them
after a render.
Note that we should really fix layoutlib_create to be able to call
the default implementation from a delegate to remove code duplication.
Change-Id: Iaf5432623e9704bb3114a8e0583c8553282c205e
Xavier Ducrohet [Fri, 3 Jun 2011 22:21:53 +0000 (15:21 -0700)]
Cherrypick
5b61ea6b from hc-mr1
Fix drawCircle in layoutlib.
Change-Id: I035c48b925cad246ed821e9e59a93d37174982ef
Xavier Ducrohet [Thu, 2 Jun 2011 23:38:38 +0000 (16:38 -0700)]
LayoutLib: enable the LAYOUT_ONLY capability.
Change-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f
Xavier Ducrohet [Thu, 2 Jun 2011 00:39:32 +0000 (17:39 -0700)]
Merge
dba35f1b from honeycomb-mr1. do not merge.
Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe
LayoutLib: Properly configure KXmlParser to read UTF8
Jake Hamby [Tue, 26 Apr 2011 23:26:46 +0000 (16:26 -0700)]
Enable full support for SMS Cell Broadcast.
Implement full support for SMS Cell Broadcast (3GPP TS 23.041).
Includes support for ETWS and CMAS emergency message types.
Includes GSM and UMTS support (CDMA will be added later).
Note: the change to GsmAlphabet.java is only necessary if the
SMS national languages support patch has been applied. If that
change has not been applied, then the changes to GsmAlphabet.java
in this patch set can safely be ignored.
Change-Id: Ia0362c53695b8ef9a0982f558f1cffa912def34b
Andreas Huber [Wed, 26 Jan 2011 18:14:38 +0000 (10:14 -0800)]
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619
related-to-bug:
3362836,
4439092
Martijn Coenen [Tue, 31 May 2011 23:03:26 +0000 (16:03 -0700)]
Prevent allocation overflows by corrupt NDEF records.
Basic sanity check for the length fields in NdefRecord; this prevents
malformed NdefRecords from crashing the vm and the entire NFC service
with it.
Bug:
4165324
Change-Id: I67b341d445d6647cb76cc24ea49afaf77de0610e
Jaikumar Ganesh [Fri, 27 May 2011 20:28:28 +0000 (13:28 -0700)]
Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
Jaikumar Ganesh [Tue, 1 Feb 2011 22:12:24 +0000 (14:12 -0800)]
Remove discoverable timeout handler. DO NOT MERGE
This is leftover code from bluez3 days. We get a property change
in Bluez4 and an intent is sent.
Change-Id: I94c57cdebe4a990846a0733a9a71cabc820419e4
TK MUN [Wed, 18 May 2011 09:30:48 +0000 (18:30 +0900)]
Allow control over search order for tethering upstream interface selection
Change-Id: If02c9b2bb61b68ebafafadc23ba17a332bc8004f
Signed-off-by: TK MUN <tk.mun@samsung.com>
Simon Wilson [Wed, 25 May 2011 00:07:39 +0000 (17:07 -0700)]
Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread
* changes:
Fix a race that could cause GL commands to be executed from the wrong thread.
RefBase subclasses can now decide how they want to be destroyed.
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
Xavier Ducrohet [Tue, 24 May 2011 02:07:18 +0000 (19:07 -0700)]
Merge
6103e22c from honeycomb-mr1. do not merge.
LayoutLib: custom styles override the default style instead of replacing it.
Intead of reading either the custom or the default style for a widget, we
read both and use the values from the custom style if it exists, or
from the default style otherwise.
Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4
Xavier Ducrohet [Mon, 23 May 2011 23:43:57 +0000 (16:43 -0700)]
Merge
2402ad60 from honeycomb-mr1. do not merge.
LayoutLib: Fix Canvas_Delegate.native_concat().
Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
Mathias Agopian [Thu, 19 May 2011 22:38:14 +0000 (15:38 -0700)]
Fix a race that could cause GL commands to be executed from the wrong thread.
Bug:
4483050
Change-Id: I37f0f3156059c208c6168ee6131d0e267d823188
Mathias Agopian [Fri, 20 May 2011 01:03:31 +0000 (18:03 -0700)]
RefBase subclasses can now decide how they want to be destroyed.
This adds a destroy() virtual on RefBase which
sublasses can implement. destroy() is called
in lieu of the destructor whenthe last strong
ref goes away.
Bug:
4483050
Change-Id: I8cbf6044a6fd3f01043a45592b5a60fa1e5fade2
Mathias Agopian [Wed, 4 May 2011 00:04:02 +0000 (17:04 -0700)]
Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
The transaction flags were atomically read-and-cleared to determine if
a transaction was needed, in the later case, mStateLock was taken to
keep the current state still during the transaction. This left a small
window open, where a layer could be removed after the transaction flags
were checked but before the transaction was started holding the lock.
In that situation eTraversalNeeded would be set but only seen during the
next transaction cycle; however, because we're handling this transaction
(because of another flag) it will be commited, "loosing" the information
about the layer being removed -- so when the next transaction cycle due
to eTraversalNeeded starts, it won't notice that layers have been removed
and won't populated the ditchedLayers array.
Bug:
4483049
Change-Id: Ibb5989312f871339928ee1aa3f9567770d72969b
Mathias Agopian [Tue, 3 May 2011 23:21:41 +0000 (16:21 -0700)]
Fix a race-condtion in SurfaceFlinger that could lead to a crash.
Client::mLayers could be accessed from different threads.
On one side from Client::attachLayer() which is currently
called from a binder thread; on the other side from
Client::detachLayer() which is always called from the main
thread.
This could lead to a corruption of Client::mLayers.
We fix this issue by adding an internal lock to Client.
Bug:
4483046
Change-Id: I5262bf1124d9a65ec6f8ffd8e367356fc33a7536
Soojung Shin [Fri, 13 May 2011 16:23:31 +0000 (01:23 +0900)]
SmsMessage: convert + to international dialing prefix
When sending an SMS to an international number in the format
+
401234567890, the "+" should be converted to the International
Dialing Prefix (in the US, 011). However, the device drops this
"+" altogether in the outbound data burst message causing the message
to fail or be sent to the wrong address.
Change-Id: If25c092d283f1703b49cf52d0379efa54639f093
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
TK MUN [Tue, 17 May 2011 05:48:42 +0000 (14:48 +0900)]
DO NOT MERGE SystemUI: update signal level when broadcast is received
- Signal level updates should be updated whenever a signal change
broadcast is received but it is failing to do so.
- Only when state change broadcast is received, signal level was
updated. (Ex: State: Idle -> State: Connected)
Change-Id: I71d86782143b3440a042164a87af64c7bee97ae2
Signed-off-by: TK MUN <tk.mun@samsung.com>
Xavier Ducrohet [Fri, 20 May 2011 03:34:28 +0000 (20:34 -0700)]
Merge
e57aa434 from honeycomb-mr1. do not merge.
LayoutLib: Fix issue where <include> with no layout params wouldn't display.
The issue is that the layout params from the root element of the included
layout should be used but this failed because loading the layout params
from the <include> tag didn't throw a RuntimeException in our modified
code (BridgeTypedArray).
Because we don't want to throw exception in general we only throw it
when reading the layout params of an include node which is pretty crappy,
but works for now.
Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
Xavier Ducrohet [Fri, 20 May 2011 20:56:47 +0000 (13:56 -0700)]
Merge "Merge
05b7b69c from honeycomb-mr1. do not merge." into gingerbread
Xavier Ducrohet [Fri, 20 May 2011 20:56:42 +0000 (13:56 -0700)]
Merge "Merge
2fae858d from Honeycomb-mr1. do not merge." into gingerbread
Xavier Ducrohet [Mon, 16 May 2011 23:29:03 +0000 (16:29 -0700)]
Merge
05b7b69c from honeycomb-mr1. do not merge.
Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c
LayoutLib: support the new baseline/margin query API.
Xavier Ducrohet [Tue, 29 Mar 2011 18:58:02 +0000 (11:58 -0700)]
Merge
2fae858d from Honeycomb-mr1. do not merge.
Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909
LayoutLib: implement data binding for most AdapterView
Kenny Root [Thu, 19 May 2011 17:55:00 +0000 (10:55 -0700)]
Merge "Break apart queries to getInstalled* API" into gingerbread
Irfan Sheriff [Wed, 11 May 2011 16:15:48 +0000 (09:15 -0700)]
Merge "Move Wifi Ap configuration to flat file" into gingerbread
Irfan Sheriff [Mon, 9 May 2011 06:02:02 +0000 (23:02 -0700)]
Move Wifi Ap configuration to flat file
Secure settings are accessible by applications without
permissions. Move to a system-only accessible file
Bug:
4391796
Change-Id: I5448943d26cccce39dd4f32423c68dad4bbf50ad
Jake Hamby [Thu, 5 May 2011 20:09:11 +0000 (13:09 -0700)]
Merge "Enable support for SMS national language shift tables." into gingerbread
Irfan Sheriff [Wed, 4 May 2011 21:16:44 +0000 (14:16 -0700)]
Handle GET_POWER failures
Return a failure when GET_POWER returns a non-conforming
format
Bug:
4380317
Change-Id: If1ce73572ae261cd6998e4289e21112c88859437
Dan Morrill [Mon, 2 May 2011 23:58:35 +0000 (16:58 -0700)]
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6
(package manager fix) to gingerbread.
Change-Id: Ia5373100e97bfe42d2211c6249996dc7ff4818e0
Eric Fischer [Wed, 27 Apr 2011 20:50:09 +0000 (13:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I36de477855f825da9a3626becd1927c31639e23d
Nick Pelly [Tue, 26 Apr 2011 23:38:00 +0000 (16:38 -0700)]
Implement dead service recovery in NFC extras library.
Change-Id: I4f1d714c625470df4cda2c4c9aacb8d27bfabb10
Irfan Sheriff [Fri, 22 Apr 2011 19:20:38 +0000 (12:20 -0700)]
Handle DHCP renewal and wakeup in framework
The native DHCP client renews IP address, but can fail to do so when the device
is in suspend. This has lead to issues where device fails to renew in time and
on networks with lots of devices re-using expired DHCP IP addresses, it leads to
severe issues.
Handle DHCP renewal and wakeup in framework
Bug:
3344732
Change-Id: Ie4062e04a477f4a233946155e40a7c999b337c3f
Kenny Root [Sat, 16 Apr 2011 00:50:10 +0000 (17:50 -0700)]
Break apart queries to getInstalled* API
To avoid blowing past the Binder IPC limit, change the
PackageManagerService to have a DB-like interaction where the client
tells the service the last "row" that it read.
The fact that we use a HashMap instead of a TreeMap makes this
problematic. For now we're just making a new ArrayList for the keys and
then sorting them for each call. This can make the API slower for callers
of this, but it's probably greatly overshadowed by the cost of the data
transfer itself.
Bug:
4064282
Change-Id: Ic370fd148d4c3813ae4f2daffa1a7c28d63d5a09
Andreas Huber [Thu, 14 Apr 2011 17:01:41 +0000 (10:01 -0700)]
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247
related-to-bug:
4286618
Eric Fischer [Tue, 12 Apr 2011 19:08:59 +0000 (12:08 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Idd866750d0c53ae0665ef2dd6b64230182d185ae
Xavier Ducrohet [Thu, 7 Apr 2011 00:03:31 +0000 (17:03 -0700)]
LayoutLib: don't render when shader's local matrix is set to 0 scale.
Change-Id: I7726d87f3dd0475ac662f535a08c6435b8b9ed1f
Xavier Ducrohet [Wed, 6 Apr 2011 03:19:17 +0000 (20:19 -0700)]
Merge
c5aeac7f from honeycomb.
LayoutLib: Fix issue with rendering mode.
When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.
This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.
Bug: http://code.google.com/p/android/issues/detail?id=15892
Change-Id: Ie9a6c5e254b16785f817dcb9fae755d4936880aa
Jake Hamby [Wed, 16 Mar 2011 03:09:46 +0000 (20:09 -0700)]
Enable support for SMS national language shift tables.
Add support for encoding and decoding SMS 7 bit user data using the
national language shift tables defined in 3GPP TS 23.038 (GSM/UMTS only),
including the new tables added in Release 9 for Indic languages.
Decoding is always supported, but encoding is only enabled for the
specific language tables added to the new integer array resources
"config_sms_enabled_single_shift_tables" and
"config_sms_enabled_locking_shift_tables" defined in
frameworks/base/core/res/res/values/config.xml. The default empty arrays
should be overridden in an OEM overlay for the specific nationalities where
SMS national language shift table encoding is allowed/mandated (e.g. Turkey).
GsmAlphabet.countGsmSeptets() will try to find the most efficient encoding
among all combinations of enabled locking shift and single shift tables.
If no 7 bit encoding is possible, 16 bit UCS-2 encoding will be used.
This change also fixes a bug in the decoder: when an escape septet
is followed by a septet with no entry in the extension (single shift)
table, TS 23.038 Table 6.2.1.1 states that the MS shall display
the character in the main GSM 7 bit default alphabet table, or the
active national language locking shift table. Previously, we were
decoding this sequence as a space character. Two consecutive escape
septets will continue to decode as a space character, according to
Note 1 of table 6.2.1.1.
Change-Id: I4dab3f0ffe39f3df2064ed93c9c05f26e274d18b
Mike Lockwood [Fri, 1 Apr 2011 21:28:45 +0000 (17:28 -0400)]
UsbManager: minor Javadoc tweak
Change-Id: I44efc54cd2a0991465aabe0ecea1b8a3291014c2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jason parks [Fri, 1 Apr 2011 20:11:06 +0000 (13:11 -0700)]
Merge "Implement teardown script." into gingerbread
Jason parks [Thu, 31 Mar 2011 18:15:18 +0000 (13:15 -0500)]
Implement teardown script.
Change-Id: I1a3feda3b1007b08fcaa24c3f8dd21abf1efd885
Jeff Hamilton [Fri, 1 Apr 2011 18:43:28 +0000 (13:43 -0500)]
Make the NFC UID forward compatible.
Change-Id: I67316ee7906c29ba11ca7c8eb36ca1b736fe59b1
James Dong [Thu, 31 Mar 2011 18:20:40 +0000 (11:20 -0700)]
Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
James Dong [Wed, 30 Mar 2011 23:04:09 +0000 (16:04 -0700)]
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32
related-to-bug:
4195127
Eric Laurent [Wed, 30 Mar 2011 21:55:49 +0000 (14:55 -0700)]
Merge "Issue
4157048: mic gain for VoIP/SIP calls." into gingerbread
Mike Lockwood [Wed, 30 Mar 2011 21:15:51 +0000 (14:15 -0700)]
Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
Trevor Johns [Wed, 30 Mar 2011 20:50:40 +0000 (13:50 -0700)]
Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
Simon Wilson [Wed, 30 Mar 2011 20:26:45 +0000 (13:26 -0700)]
Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
TK MUN [Wed, 30 Mar 2011 00:27:07 +0000 (09:27 +0900)]
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
When user uncheck "Data Enabled" check box, WiMAX goes
into "disconnected" state.
Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2
Signed-off-by: TK MUN <tk.mun@samsung.com>
Trevor Johns [Wed, 30 Mar 2011 18:30:09 +0000 (11:30 -0700)]
Fixing line in Market IAB docs that explains how to bind to the
MarketService.
We use the IMarketBillingService, which is incorrect. It should be
"com.android.vending.billing.MarketBillingService.BIND".
Change-Id: Ie361e58cea8aca6d70bd48bce062ca8d062281ee
Eric Fischer [Wed, 30 Mar 2011 17:41:05 +0000 (10:41 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jason parks [Wed, 30 Mar 2011 15:17:53 +0000 (08:17 -0700)]
Merge "Send out a broadcast that the system is being factory reset." into gingerbread
Mike Lockwood [Tue, 29 Mar 2011 23:49:42 +0000 (16:49 -0700)]
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level. On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.
Change-Id: I2c4f6edb34aae2064f4b62ec0461d1fdd8770541
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Laurent [Wed, 30 Mar 2011 01:22:57 +0000 (18:22 -0700)]
Issue
4157048: mic gain for VoIP/SIP calls.
Herring board exhibits a strong echo even in non speakerphone modes.
To compensate the lack of AEC or AES when not in speakerphone, the mic gain
had been reduced in the ADC. But this has an adverse effect on other VoIP applications
that have their own AEC and are penalized by the weak mic gain.
This workaround enables an acceptable mic gain for other VoIP apps while offering a
SIP call experience which is not worse than it was with the residual echo that was
present even with mic gain reduction.
Change-Id: I33fd37858758e94e42ef5b545d3f0dc233220bf1
Justin Ho [Tue, 29 Mar 2011 21:43:13 +0000 (14:43 -0700)]
Updated CDMA roaming icons
Change-Id: Ib455c2b7196c2c2add58422187e6d752a28364c6
Jean-Baptiste Queru [Tue, 29 Mar 2011 21:05:30 +0000 (14:05 -0700)]
No-op - reconcile with open-source gingerbread
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
Michael I. Gold [Thu, 23 Dec 2010 21:51:36 +0000 (13:51 -0800)]
egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same. eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.
Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug:
2964479
Robert Greenwalt [Tue, 29 Mar 2011 18:36:28 +0000 (11:36 -0700)]
Only leave one default network up at a time.
If original refuses to tear down, tear down new one. It's better
to have none (which will try to launch them all again) than two.
Really people shouldn't refuse the teardown request.
bug:
4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
Eric Fischer [Tue, 29 Mar 2011 17:54:11 +0000 (10:54 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2d4afddb1ff99b9861647d479ef5ce2de49b684d
Robert Greenwalt [Sat, 26 Mar 2011 15:58:01 +0000 (08:58 -0700)]
Merge "Fix Default route after secondary net use." into gingerbread
Robert Greenwalt [Sat, 26 Mar 2011 15:32:25 +0000 (08:32 -0700)]
Fix Default route after secondary net use.
Backport of honeycomb-mr1 change 103299 adding a host route for the
default gateway before adding the default route.
Also fixing bug where "already active" condition of APN failed to
propagate the default gateway info, result in a loss of that address.
bug:
4175328
Change-Id: I4cf8605b259cf40c3631c7ce6cca4c75c1b22651
Jeff Hamilton [Fri, 25 Mar 2011 21:53:14 +0000 (14:53 -0700)]
Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
Jeff Hamilton [Fri, 25 Mar 2011 21:16:57 +0000 (16:16 -0500)]
Make STOP_APP_SWITCHES signatureOrSystem.
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.
Bug:
4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
Irfan Sheriff [Fri, 25 Mar 2011 18:01:02 +0000 (11:01 -0700)]
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
Irfan Sheriff [Mon, 17 Jan 2011 20:38:30 +0000 (12:38 -0800)]
DO NOT MERGE Pick upstream intf with valid IP conf
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration
Bug:
3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
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