Jean-Baptiste Queru
428ece23f4
am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74
...
* commit 'c4aa19a578b8a11bea225994c58116b407e63a69':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:27:06 -08:00
Jean-Baptiste Queru
2accfc110a
am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
...
* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
2012-02-24 10:26:53 -08:00
Jean-Baptiste Queru
c4aa19a578
am ea227787: Merge changes I903353c5,I822dcc74
...
* commit 'ea227787253e29da2d688399b097e05708d3bf73':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:24:34 -08:00
Svetoslav Ganov
88c6d6e19c
Merge "AccessibilityNodeInfos node properly cached."
2012-02-24 10:23:06 -08:00
John Reck
0d4134834e
Merge "Fix HitTest type detection"
2012-02-24 10:22:56 -08:00
Jean-Baptiste Queru
d6a25154d9
Merge "stagefright aacenc: Fix an inline asm constraint"
2012-02-24 10:22:34 -08:00
Svetoslav Ganov
afd5fab3ab
AccessibilityNodeInfos node properly cached.
...
1. AccessibilityNodeInfo were not cloned when cached
and obtained from the cache. This was causing a
problem when the client calls #recycle() as he
should since this results in wiping the data of
the cached node info.
bug:6026952
Change-Id: I5807b09d95ef6f310327192ff91f036adf337e33
2012-02-24 10:22:00 -08:00
Andreas Huber
64c2263428
Merge "Small fix to MediaCodec"
2012-02-24 10:16:28 -08:00
John Reck
59265e896a
Fix HitTest type detection
...
Change-Id: Ide3d137de18302d2bb83437c3709a31afcdef9ff
2012-02-24 10:13:24 -08:00
Jean-Baptiste Queru
ea22778725
Merge changes I903353c5,I822dcc74
...
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
2012-02-24 10:07:49 -08:00
Jean-Baptiste Queru
46f465c25f
am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
...
* commit '1527811984557ee0b5d6e476e84ed147e073cb45':
stagefright aacenc: Zero-initialize a struct
2012-02-24 10:03:47 -08:00
Jean-Baptiste Queru
1527811984
am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
...
* commit '61022b06a352e5a6da382a09f51ea624581ada7f':
stagefright aacenc: Zero-initialize a struct
2012-02-24 10:00:56 -08:00
Jean-Baptiste Queru
61022b06a3
am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
...
* commit '5f83b95705fa84b87b498d67f3b1b8dc34038474':
stagefright aacenc: Zero-initialize a struct
2012-02-24 09:57:51 -08:00
Jean-Baptiste Queru
5f83b95705
am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
...
* commit 'bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
2012-02-24 09:54:58 -08:00
Jean-Baptiste Queru
ff7629263b
am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
...
* commit '4de803c76d4afd0f542c086b555b71729b3c5796':
stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:52:54 -08:00
Jean-Baptiste Queru
4de803c76d
am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
...
* commit '459df4ef8368ea84ce7d07981c6867a7b7fef14e':
stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:50:27 -08:00
Jean-Baptiste Queru
459df4ef83
am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
...
* commit 'e7650c327980f15c6cd53ad0081a54d78c3248f0':
stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:48:14 -08:00
Jean-Baptiste Queru
bf45bbf3b4
Merge "stagefright aacenc: Zero-initialize a struct"
2012-02-24 09:47:23 -08:00
Jean-Baptiste Queru
e7650c3279
am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
...
* commit 'e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
2012-02-24 09:45:40 -08:00
Alon Albert
bd2516165e
Add new Reminder Method: Alarm
...
Change-Id: I7c0bc3c7eb1cc3b76900a04760ace52a5535b617
2012-02-24 09:40:27 -08:00
Robert Greenwalt
1434d7b855
Seperate RIL constants from the framework.
...
We have two sets of constants for network type. One used by the RIL can't
be changed without big pains with OEM/Radio vendors. The other has been published
as part of the framework and can't be easily changed either.
Separate the two so it's clear where one should be used versus the other.
bug:5717664
Change-Id: Ibf21f9165662e75557c7254fc9ad9a4870ba4af9
2012-02-24 09:37:37 -08:00
Jean-Baptiste Queru
394906170c
am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
...
* commit '307f47aa5def85d0c0bb4af725ff557707c5be86':
stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:28:09 -08:00
Jean-Baptiste Queru
307f47aa5d
am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
...
* commit '7e8b65dfbaaf1e5901e49e048f92b19c184eabe4':
stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:25:34 -08:00
Jean-Baptiste Queru
7e8b65dfba
am 7ffa4546: am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
...
* commit '7ffa4546de0b9e22b4896731cdfd1655f61a0b6c':
stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:23:23 -08:00
Jean-Baptiste Queru
7ffa4546de
am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
...
* commit '47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
2012-02-24 09:20:44 -08:00
Jean-Baptiste Queru
e5bdd24b69
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
2012-02-24 09:20:37 -08:00
Jean-Baptiste Queru
364ac60cb0
am 5c2f1220: am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
...
* commit '5c2f1220f90ae68a064195ba3c94f1319813f32c':
stagefright aacenc: Fix inline asm
2012-02-24 09:12:17 -08:00
Andreas Huber
51656aa9b5
Small fix to MediaCodec
...
Change-Id: I6bcbfd35fdf5a2b0260b8f07a630a5b380e139a0
2012-02-24 09:06:58 -08:00
Nick Kralevich
1b05438ff3
projects-eclipse: fix typo
...
Change-Id: I15962bd566b0375e8ca50c1b61350f06e6733389
2012-02-24 09:05:00 -08:00
Jean-Baptiste Queru
5c2f1220f9
am 901b8bb0: am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
...
* commit '901b8bb09ffdb0c64c0a8522016ffc1da6358a92':
stagefright aacenc: Fix inline asm
2012-02-24 08:57:40 -08:00
Jean-Baptiste Queru
901b8bb09f
am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"
...
* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
stagefright aacenc: Fix inline asm
2012-02-24 08:53:30 -08:00
Jean-Baptiste Queru
47b56c5a46
Merge "stagefright aacenc: Add const declarations to some pointers"
2012-02-24 08:53:25 -08:00
Jean-Baptiste Queru
aa86aa60dc
am 1b704610: Merge "stagefright aacenc: Fix inline asm"
...
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
2012-02-24 08:50:32 -08:00
Jean-Baptiste Queru
1b7046108c
Merge "stagefright aacenc: Fix inline asm"
2012-02-24 08:38:23 -08:00
Jean-Baptiste Queru
0862a56cae
am 0c96e869: am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
...
* commit '0c96e8690408e3cfc12eee521a442c52f1c10b27':
stagefright aacenc: Fix inline asm constraints
2012-02-24 08:01:10 -08:00
Jean-Baptiste Queru
0c96e86904
am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
...
* commit '41087f7920196f81a50f320c9d538b36534f178d':
stagefright aacenc: Fix inline asm constraints
2012-02-24 07:59:05 -08:00
Jean-Baptiste Queru
41087f7920
am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
...
* commit 'd7ab4e0c42a34331620c63c8c58d0dabc658eb1a':
stagefright aacenc: Fix inline asm constraints
2012-02-24 07:55:59 -08:00
Jean-Baptiste Queru
d7ab4e0c42
am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
...
* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
2012-02-24 07:53:43 -08:00
Jean-Baptiste Queru
bf1e85bfc8
Merge "stagefright aacenc: Fix inline asm constraints"
2012-02-24 07:39:03 -08:00
George Mount
374d243a1a
Merge "Disable selection when nothing selected."
2012-02-24 07:29:13 -08:00
Ben Murdoch
0168bef13f
Fix looping HTML5 Audio.
...
When an <audio> tag has the loop=true attribute,
Webkit tells us to seek back to 0 before we are supposed
to have stopped the stream. But by the time that the message
gets back to the Android MediaPlayer java side, it's already
stopped. So after seeking, we play() again if the player is in
the COMPLETED state. Change the code to do this and handle
the case that we call play on a COMPLETED stream
(resetting internal state, etc).
Note that this has the side effect that we will start playing
the stream after any seek on a COMPLETED stream - e.g. dragging
the slider thumb on the progress track after the stream is
finished.
Bug: 5461143
Change-Id: I6cf4d46d9a1985caf9f9ab85dbcf65535c8dcd77
2012-02-24 11:15:11 +00:00
Michael Jurka
4abe5486f8
Merge "Fix blip after notifications are swiped"
2012-02-23 23:58:30 -08:00
Mathias Agopian
2d77b5332a
Merge changes I97807db6,I7d350bc0
...
* changes:
workaround for an issue where the screen would flicker sometimes
fix an issue in SF where we could miss some updates
2012-02-23 21:23:02 -08:00
Mathias Agopian
6ea851fadf
workaround for an issue where the screen would flicker sometimes
...
bug: 6020860
Change-Id: I97807db66b66c5f4dcbed0df79d5d257cfc7c0bd
2012-02-23 21:20:01 -08:00
Mathias Agopian
f37d8fcf05
fix an issue in SF where we could miss some updates
...
Change-Id: I7d350bc05d1596655baddff3deaebaba58c9bcc0
2012-02-23 21:17:01 -08:00
James Dong
edb948b877
Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
2012-02-23 21:00:59 -08:00
John Reck
5d5b378383
Merge "Support email and phone types"
2012-02-23 19:28:20 -08:00
Svetoslav Ganov
42d840b91d
Merge "Fixing issues with the AccessibilityNodeInfo cache."
2012-02-23 19:04:41 -08:00
Svetoslav Ganov
57c7fd5a43
Fixing issues with the AccessibilityNodeInfo cache.
...
1. Before there were two caches one in the app process that
kept track only the ids of infos that were given to a
querying client and one in the querying client that
holds the infos. This design requires precise sync
between the caches. Doing that is somehow complicated
since the app has cache for each window and it has
to intercept all accessibility events from that window
to manage the cache. Each app has to have a cache for
each querying client. This approach would guarantee that
no infos are fetched twice but due to its stateful nature
and the two caches is tricky to implement and adds
unnecessary complexity. Now there is only one cache in
the client and the apps are stateless. The client is
passing flags to the app that are a clue what nodes to
prefetch. This approach may occasionally fetch a node
twice but it is considerably simpler and stateless
from the app perspective - there is only one cache.
Fetching a node more than once does not cause much
overhead compared to the IPC.
Change-Id: Ia02f6fe4f82cff9a9c2e21f4a36747de0f414c6f
2012-02-23 18:51:04 -08:00
Xavier Ducrohet
6caa03004d
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
...
* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':
2012-02-23 18:49:51 -08:00