31047 Commits

Author SHA1 Message Date
Conley Owens
644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
2011-06-09 12:14:11 -07:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Marco Nelissen
90dc22fa09 am a02d9bf9: Make sure we don\'t read from invalid fds
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
2011-06-09 10:36:24 -07:00
Marco Nelissen
a02d9bf9c3 Make sure we don't read from invalid fds
b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
2011-06-09 09:39:52 -07:00
Dan Morrill
e33fc82cc9 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
2011-06-08 21:58:06 -07:00
Mathias Agopian
17574b9a0a am 19974ecc: Fix a leak in RefBase (DO NOT MERGE)
* commit '19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
  Fix a leak in RefBase (DO NOT MERGE)
2011-06-08 19:56:06 -07:00
Mathias Agopian
19974eccdb 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
2011-06-08 16:13:39 -07:00
Jean-Baptiste Queru
0315a2c564 am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"
* commit 'f3894a04acb9cdd67a02a1a4c82ba7d178c13000':
  Tweak setViewport stuff for fwd-compat
2011-06-08 14:07:19 -07:00
Jean-Baptiste Queru
f3894a04ac Merge "Tweak setViewport stuff for fwd-compat" 2011-06-08 13:10:58 -07:00
Jean-Baptiste Queru
de26719153 Tweak setViewport stuff for fwd-compat
Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
2011-06-08 13:00:58 -07:00
Jake Hamby
ae62b7b0bc resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
2011-06-07 16:24:15 -07:00
Jake Hamby
66040bbb08 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
2011-06-06 18:56:20 -07:00
Xavier Ducrohet
67f09cd090 am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread
* commit 'd6ce6791f26fd0a7cf89ded2847011a4894013e1':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
2011-06-06 18:08:40 -07:00
Xavier Ducrohet
ab3f5779ae 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.
2011-06-06 18:08:32 -07:00
Romain Guy
fbef58faad am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
  Disable plugins if setPluginsEnabled(false) called.
2011-06-06 17:54:12 -07:00
Romain Guy
258f32e2e3 Merge "Disable plugins if setPluginsEnabled(false) called." 2011-06-06 16:23:25 -07:00
Jake Hamby
0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
2011-06-06 15:33:37 -07:00
Stephen Li
83b69713f2 GPS: Changes to enable on-demand data call flow for CDMA connections
In the CDMA case we do not get a valid APN on a data connection request
to the connectivity manager. A fix is put in so that even if we get a
null APN we populate this field before we call native_agps_data_conn_open()
method to avoid a run time exception.

Change-Id: I134ead5d8b177fced9b14756c6bd8199a2b9c35d
2011-06-05 16:55:05 -07:00
Xavier Ducrohet
d6ce6791f2 Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 2011-06-03 18:53:41 -07:00
Xavier Ducrohet
ee1b497648 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.
2011-06-03 18:53:23 -07:00
Xavier Ducrohet
156a211b21 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
2011-06-03 18:37:09 -07:00
Xavier Ducrohet
21726044a9 Cherrypick 5b61ea6b from hc-mr1
Fix drawCircle in layoutlib.

Change-Id: I035c48b925cad246ed821e9e59a93d37174982ef
2011-06-03 16:02:12 -07:00
Xavier Ducrohet
f174cd86bd LayoutLib: enable the LAYOUT_ONLY capability.
Change-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f
2011-06-02 16:38:38 -07:00
Tero Saarni
29086e46be 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>
2011-06-02 23:06:58 +03:00
Andreas Huber
8e97372913 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.
2011-06-02 07:37:52 -07:00
Xavier Ducrohet
8f17523dca Merge dba35f1b from honeycomb-mr1. do not merge.
Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe
LayoutLib: Properly configure KXmlParser to read UTF8
2011-06-01 18:32:57 -07:00
Jake Hamby
ab79ee4adc 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
2011-06-01 15:54:20 -07:00
Andreas Huber
8050a02b01 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
2011-06-01 15:54:07 -07:00
Martijn Coenen
ed1c8d7dc0 am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.
* commit '0aa1017f9183bca752c95af72f73120e102ab2d3':
  Prevent allocation overflows by corrupt NDEF records.
2011-06-01 09:51:15 -07:00
Martijn Coenen
0aa1017f91 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
2011-05-31 19:06:59 -07:00
Jaikumar Ganesh
c841001750 am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
  Remove discoverable timeout handler. DO NOT MERGE
2011-05-27 13:46:50 -07:00
Jaikumar Ganesh
1b755dea38 Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 2011-05-27 13:28:28 -07:00
Jaikumar Ganesh
e984291f8f 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
2011-05-27 13:06:45 -07:00
TK MUN
cecb710a6d am 94260caf: Allow control over search order for tethering upstream interface selection
* commit '94260caf2fb3f5dbf6e17b29a269b46ea05f8680':
  Allow control over search order for tethering upstream interface selection
2011-05-25 10:42:07 -07:00
TK MUN
94260caf2f Allow control over search order for tethering upstream interface selection
Change-Id: If02c9b2bb61b68ebafafadc23ba17a332bc8004f
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-05-25 10:32:06 -07:00
Jaikumar Ganesh
58ada2f3bb am 94062517: Merge "Require bonding and encryption for PBAP server"
* commit '94062517ae5573f9a1a877a83fe7d8e6d1a2c350':
  Require bonding and encryption for PBAP server
2011-05-25 09:59:44 -07:00
Jaikumar Ganesh
94062517ae Merge "Require bonding and encryption for PBAP server" 2011-05-25 09:27:32 -07:00
Jean-Baptiste Queru
54ab72e1c3 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.
2011-05-25 09:04:40 -07:00
Jean-Baptiste Queru
038e8f9984 Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 2011-05-25 08:06:17 -07:00
Simon Wilson
b9783b49f4 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.
2011-05-24 17:29:12 -07:00
Simon Wilson
c9cd2387b6 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.
2011-05-24 17:07:39 -07:00
Conley Owens
10b364b4be am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '4cf0eee755046734568959ac01f207b108e449c0':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-24 15:01:18 -07:00
Conley Owens
4cf0eee755 Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 2011-05-24 14:05:05 -07:00
Xavier Ducrohet
228e471627 am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.
* commit '34f5991ebe8b203f1720caf95889c15dd131d86e':
  Merge 6103e22c from honeycomb-mr1. do not merge.
2011-05-24 12:28:38 -07:00
Xavier Ducrohet
34f5991ebe 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
2011-05-24 10:55:30 -07:00
Xavier Ducrohet
af83d4ecff am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.
* commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
2011-05-24 10:54:35 -07:00
Xavier Ducrohet
c7b87766b2 Merge 2402ad60 from honeycomb-mr1. do not merge.
LayoutLib: Fix Canvas_Delegate.native_concat().

Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
2011-05-23 17:51:22 -07:00
Mathias Agopian
6f96080f33 Fix a race that could cause GL commands to be executed from the wrong thread.
Bug: 4483050
Change-Id: I37f0f3156059c208c6168ee6131d0e267d823188
2011-05-23 16:14:10 -07:00
Mathias Agopian
9e7636681e 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
2011-05-23 16:13:48 -07:00
Mathias Agopian
fa21cb2e58 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
2011-05-23 16:13:20 -07:00