OSDN Git Service
mike wakerly [Wed, 29 Jun 2011 00:19:05 +0000 (17:19 -0700)]
am
2f9ad8b4: Add intent actions for new firmware events.
* commit '
2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
Add intent actions for new firmware events.
mike wakerly [Tue, 28 Jun 2011 00:29:30 +0000 (17:29 -0700)]
Add intent actions for new firmware events.
Change-Id: I8129b7812c0d551111f0c85eacc9535a441e5453
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:33:46 +0000 (11:33 -0700)]
am
4fea5373: Merge "Add WEBP to the list of Image formats that support Compression."
* commit '
4fea5373d350f5d855408ffaa41206b8fa743c55':
Add WEBP to the list of Image formats that support Compression.
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:28:30 +0000 (11:28 -0700)]
am
f458d5fd: Merge "Tweak for forward-compatibility"
* commit '
f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
Tweak for forward-compatibility
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:13:42 +0000 (11:13 -0700)]
Merge "Add WEBP to the list of Image formats that support Compression."
Jean-Baptiste Queru [Fri, 24 Jun 2011 18:08:36 +0000 (11:08 -0700)]
Merge "Tweak for forward-compatibility"
Jean-Baptiste Queru [Fri, 24 Jun 2011 17:49:18 +0000 (10:49 -0700)]
Tweak for forward-compatibility
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
Vikas Arora [Thu, 23 Jun 2011 07:41:13 +0000 (13:11 +0530)]
Add WEBP to the list of Image formats that support Compression.
Note: The integrator of this change to Android internal code-repo will
have to run one extra step 'make update-api' to update 'api/current.txt'
file corresponding to approved API. The AOSP branch didn't have this
file, hence I could not add the same to this change. The updated file
'api/current.txt' has to be submitted along with this change.
Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
Raphael Moll [Thu, 23 Jun 2011 00:44:29 +0000 (17:44 -0700)]
am
e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."
* commit '
e2b41b0d5c8db85a60cd190c7094052db61114b2':
Laoutlib_creator: keep original of delegate methods.
Raphael Moll [Thu, 23 Jun 2011 00:11:27 +0000 (17:11 -0700)]
Merge "Laoutlib_creator: keep original of delegate methods."
Jaikumar Ganesh [Tue, 21 Jun 2011 20:24:46 +0000 (13:24 -0700)]
am
b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread
* commit '
b38fa2a0ac2bde56504929de6a3dd61ac723958e':
DO NOT MERGE Incoming Bluetooth Connection requests - dialog.
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 [Mon, 20 Jun 2011 22:54:07 +0000 (15:54 -0700)]
am
17523abb: NFC Adapter Extras API update.
* commit '
17523abb45b7f77f35af53e895d74be13f2314e0':
NFC Adapter Extras API update.
Conley Owens [Mon, 20 Jun 2011 20:04:45 +0000 (13:04 -0700)]
am
bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"
* commit '
bf5adfa5e558827fbb4771720433887bb3cbaefd':
Check if we are in daylight time when calculating timezone
Conley Owens [Mon, 20 Jun 2011 18:01:41 +0000 (11:01 -0700)]
Merge "Check if we are in daylight time when calculating timezone"
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:05:07 +0000 (09:05 -0700)]
am
e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '
e3b05d09163257b888c86f2a560e10c48f4cf029':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:45:53 +0000 (09:45 -0700)]
Merge "Tweaks for forward-compatibility"
Jean-Baptiste Queru [Sat, 18 Jun 2011 16:42:04 +0000 (09:42 -0700)]
Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
Raphael Moll [Sat, 18 Jun 2011 00:12:52 +0000 (17:12 -0700)]
Laoutlib_creator: keep original of delegate methods.
For specific methods, Layoublib_create can rewrite the implementation
of a method to invoke a delegate instead of the original code. This
allows layoutlib to implement native code or override existing behavior.
This patch also 'saves' the original implementation of a rewritten
method so that the delegate can access the original implementation
as needed. Obviously this is only done for non-native methods.
Given a non-native SomeClass.MethodName, we generate 2 methods:
- A copy of the original method named "SomeClass.MethodName_original".
The content is the original method as-is from the reader.
- A brand new implementation of SomeClass.MethodName which calls to a
non-existing method named "SomeClass_delegate.MethodName".
The implementation of this 'delegate' method is done in layoutlib_brigde.
Change-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6
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
Maarten Hooft [Thu, 16 Jun 2011 22:48:55 +0000 (15:48 -0700)]
am
d76baeb4: Merge "Import revised Croatian translations." into gingerbread
* commit '
d76baeb4d836c33cc68cbb0c2e237c066f368529':
Import revised Croatian translations.
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 23:29:02 +0000 (16:29 -0700)]
am
df1734e3: Fix lease duration handling
* commit '
df1734e3f57646df1fa96275cbb65bb91ac9d2ac':
Fix lease duration handling
Mathias Agopian [Wed, 15 Jun 2011 21:13:04 +0000 (14:13 -0700)]
am
afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
* commit '
afffa8fa9f82a7343e1158bf921931fd3e3df615':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
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
Marco Nelissen [Wed, 15 Jun 2011 15:33:09 +0000 (08:33 -0700)]
resolved conflicts for merge of
d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
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
Dan Morrill [Sat, 11 Jun 2011 16:52:50 +0000 (09:52 -0700)]
am
8688d470: Moving flag to a member field instead of a stack variable.
* commit '
8688d4708117db446d6ba2855f1d8ad715bb4d72':
Moving flag to a member field instead of a stack variable.
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:52:40 +0000 (14:52 -0700)]
am
a1a107b8: 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
* commit '
a1a107b8cb8cbb7eea796f375eb72958e8b148e3':
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.
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
Conley Owens [Thu, 9 Jun 2011 19:14:11 +0000 (12:14 -0700)]
am
d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit '
d8b027b18f5a922ef729c6ee363eecb053358d47':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Conley Owens [Thu, 9 Jun 2011 18:12:04 +0000 (11:12 -0700)]
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
Marco Nelissen [Thu, 9 Jun 2011 17:36:24 +0000 (10:36 -0700)]
am
a02d9bf9: Make sure we don\'t read from invalid fds
* commit '
a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
Make sure we don't read from invalid fds
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 [Thu, 9 Jun 2011 02:56:06 +0000 (19:56 -0700)]
am
19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '
19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
Fix a leak in RefBase (DO NOT MERGE)
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
Jean-Baptiste Queru [Wed, 8 Jun 2011 21:07:19 +0000 (14:07 -0700)]
am
f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit '
f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
Tweak setViewport stuff for fwd-compat
Jean-Baptiste Queru [Wed, 8 Jun 2011 20:10:58 +0000 (13:10 -0700)]
Merge "Tweak setViewport stuff for fwd-compat"
Jean-Baptiste Queru [Wed, 8 Jun 2011 20:00:58 +0000 (13:00 -0700)]
Tweak setViewport stuff for fwd-compat
Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
Jake Hamby [Tue, 7 Jun 2011 23:24:15 +0000 (16:24 -0700)]
resolved conflicts for merge of
66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
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 [Tue, 7 Jun 2011 01:08:40 +0000 (18:08 -0700)]
am
d6ce6791: Merge "Cherrypick
d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit '
d6ce6791f26fd0a7cf89ded2847011a4894013e1':
Cherrypick
d1ed33c4 from hc-mr1. do not merge.
Xavier Ducrohet [Tue, 7 Jun 2011 01:08:32 +0000 (18:08 -0700)]
am
ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread
* commit '
ee1b497648a0c3c03b09c4739619f23315d491fb':
Cherrypick
5b61ea6b from hc-mr1
LayoutLib: enable the LAYOUT_ONLY capability.
Merge
dba35f1b from honeycomb-mr1. do not merge.
Romain Guy [Tue, 7 Jun 2011 00:54:12 +0000 (17:54 -0700)]
am
258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '
258f32e2e3ff7f4f4b1395cae292098141047fde':
Disable plugins if setPluginsEnabled(false) called.
Romain Guy [Mon, 6 Jun 2011 23:23:25 +0000 (16:23 -0700)]
Merge "Disable plugins if setPluginsEnabled(false) called."
Jake Hamby [Mon, 6 Jun 2011 22:33:37 +0000 (15:33 -0700)]
resolved conflicts for merge of
ab79ee4a to gingerbread-plus-aosp
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
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
Tero Saarni [Thu, 2 Jun 2011 18:05:38 +0000 (21:05 +0300)]
Disable plugins if setPluginsEnabled(false) called.
Old deprecated method for enabling/disabling plugins was
ignoring flag parameter and causing plugins always to be loaded.
Fixes issue 17242.
Change-Id: I1da10a3ee7f3041e59b43641169c3935a05aa347
Signed-off-by: Tero Saarni <tero.saarni@gmail.com>
Andreas Huber [Thu, 2 Jun 2011 14:37:52 +0000 (07:37 -0700)]
am
8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '
8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
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 [Wed, 1 Jun 2011 16:51:15 +0000 (09:51 -0700)]
am
0aa1017f: Prevent allocation overflows by corrupt NDEF records.
* commit '
0aa1017f9183bca752c95af72f73120e102ab2d3':
Prevent allocation overflows by corrupt NDEF records.
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:46:50 +0000 (13:46 -0700)]
am
1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '
1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
Remove discoverable timeout handler. DO NOT MERGE
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, 25 May 2011 17:42:07 +0000 (10:42 -0700)]
am
94260caf: Allow control over search order for tethering upstream interface selection
* commit '
94260caf2fb3f5dbf6e17b29a269b46ea05f8680':
Allow control over search order for tethering upstream interface selection
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>
Jaikumar Ganesh [Wed, 25 May 2011 16:59:44 +0000 (09:59 -0700)]
am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
94062517ae5573f9a1a877a83fe7d8e6d1a2c350':
Require bonding and encryption for PBAP server
Jaikumar Ganesh [Wed, 25 May 2011 16:27:32 +0000 (09:27 -0700)]
Merge "Require bonding and encryption for PBAP server"
Jean-Baptiste Queru [Wed, 25 May 2011 16:04:40 +0000 (09:04 -0700)]
am
038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '
038e8f99845e171c0d9d606f5697e36b1b684d01':
Adding support for parsing of SMS-CB pdus in UMTS format.
Jean-Baptiste Queru [Wed, 25 May 2011 15:06:17 +0000 (08:06 -0700)]
Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
Simon Wilson [Wed, 25 May 2011 00:29:12 +0000 (17:29 -0700)]
am
c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into gingerbread
* commit '
c9cd2387b6938a6fbefc731d2177902266f2a130':
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.
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.
Conley Owens [Tue, 24 May 2011 22:01:18 +0000 (15:01 -0700)]
am
4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '
4cf0eee755046734568959ac01f207b108e449c0':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
Conley Owens [Tue, 24 May 2011 21:05:05 +0000 (14:05 -0700)]
Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
Xavier Ducrohet [Tue, 24 May 2011 19:28:38 +0000 (12:28 -0700)]
am
34f5991e: Merge
6103e22c from honeycomb-mr1. do not merge.
* commit '
34f5991ebe8b203f1720caf95889c15dd131d86e':
Merge
6103e22c from honeycomb-mr1. do not merge.
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 [Tue, 24 May 2011 17:54:35 +0000 (10:54 -0700)]
am
c7b87766: Merge
2402ad60 from honeycomb-mr1. do not merge.
* commit '
c7b87766b21fe5cf2f644efa8753b936d413dc9a':
Merge
2402ad60 from honeycomb-mr1. do not merge.
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 [Mon, 23 May 2011 22:11:04 +0000 (15:11 -0700)]
am
4e4ad341: SmsMessage: convert + to international dialing prefix
* commit '
4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7':
SmsMessage: convert + to international dialing prefix
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 [Mon, 23 May 2011 21:47:38 +0000 (14:47 -0700)]
am
6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received
* commit '
6f0394a3b4d6082c9cb01de4a220a3b082e1840a':
DO NOT MERGE SystemUI: update signal level when broadcast is received
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 [Mon, 23 May 2011 16:52:55 +0000 (09:52 -0700)]
am
4c1e73b6: Merge
e57aa434 from honeycomb-mr1. do not merge.
* commit '
4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
Merge
e57aa434 from honeycomb-mr1. do not merge.
Xavier Ducrohet [Mon, 23 May 2011 16:52:52 +0000 (09:52 -0700)]
am
f791863f: Merge "Merge
05b7b69c from honeycomb-mr1. do not merge." into gingerbread
* commit '
f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge
05b7b69c from honeycomb-mr1. do not merge.
Xavier Ducrohet [Mon, 23 May 2011 16:52:41 +0000 (09:52 -0700)]
am
bb43828a: Merge "Merge
2fae858d from Honeycomb-mr1. do not merge." into gingerbread
* commit '
bb43828aa749e71d4e52ba69db01b83c83a755b5':
Merge
2fae858d from Honeycomb-mr1. do not merge.
David Sobreira Marques [Sun, 17 Apr 2011 15:46:50 +0000 (12:46 -0300)]
Fixing concurrency issue on IccPhoneBookInterfaceManager.
All the reads/updates methods are synchronous calls that rely
on an unique lock object in order to wait for the asynchronous
simcard operations to complete and return appropriate results
Concurent calls to these methods will cause errors when one
completed operation will unlock all waiting calls generating
inconsistent results on some of the method calls.
Change-Id: I8b87004ac039bcb971b8369f7640281f1bf9eb35
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.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
Jaikumar Ganesh [Fri, 20 May 2011 21:21:29 +0000 (14:21 -0700)]
am
4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
* commit '
4b41df613db19c5fe1d8c0d05ef314326fd3f95b':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
Jaikumar Ganesh [Fri, 20 May 2011 21:21:23 +0000 (14:21 -0700)]
am
198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
* commit '
198ed3e46af4bd51fa6be0186bacdde9e832ba94':
BT: Wrong publishing result of bonding error code.
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
Jaikumar Ganesh [Fri, 20 May 2011 20:37:00 +0000 (13:37 -0700)]
Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
Jaikumar Ganesh [Fri, 20 May 2011 20:35:20 +0000 (13:35 -0700)]
Merge "BT: Wrong publishing result of bonding error code."
Jaikumar Ganesh [Fri, 20 May 2011 17:23:48 +0000 (10:23 -0700)]
am
848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"
* commit '
848a1e3d8522129c8a39d198a10b134926d71bd2':
OBEX: Fix PrivateOutputStream small write problem