Andreas Huber
e944c0fe02
am d3bf3eea: am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
...
* commit 'd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
Turn another assertion into a runtime error. Damn you surfaces.
2011-01-19 09:53:30 -08:00
Andreas Huber
d3bf3eeadd
am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
...
* commit '2597aedb3869e46f945359c529e03263c77a944d':
Turn another assertion into a runtime error. Damn you surfaces.
2011-01-19 09:51:42 -08:00
Andreas Huber
2597aedb38
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
2011-01-19 09:49:32 -08:00
Eric Laurent
0d2e17f5d9
am 42ac3249: am 42466b1c: Merge "Tentative fix for issue 3362362." into honeycomb
...
* commit '42ac32498aea67a43f666946c4b77a376f54cfaf':
Tentative fix for issue 3362362.
2011-01-19 09:46:03 -08:00
Eric Laurent
42ac32498a
am 42466b1c: Merge "Tentative fix for issue 3362362." into honeycomb
...
* commit '42466b1cad4cec1aa746809dfcca702456415be4':
Tentative fix for issue 3362362.
2011-01-19 09:43:17 -08:00
Eric Laurent
42466b1cad
Merge "Tentative fix for issue 3362362." into honeycomb
2011-01-19 09:40:34 -08:00
Robert Greenwalt
b57da00b81
Merge "Fix Tethering's handling of a system restart."
2011-01-19 09:33:48 -08:00
Andreas Huber
ba1b16790a
Turn another assertion into a runtime error. Damn you surfaces.
...
Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab
related-to-bug: 3335220
2011-01-19 09:20:58 -08:00
Jean-Michel Trivi
d2760821e9
am 3ebe75cc: am 928e48f2: Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb
...
* commit '3ebe75cc51a268b273d63591c3035e03f2b68800':
Fix bug 2084122: enable application control over text synth volume
2011-01-19 09:17:27 -08:00
Jean-Michel Trivi
3ebe75cc51
am 928e48f2: Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb
...
* commit '928e48f2bae9816fb5b3f1444f8ca9a4de15d8c3':
Fix bug 2084122: enable application control over text synth volume
2011-01-19 09:14:57 -08:00
Jean-Michel Trivi
928e48f2ba
Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb
2011-01-19 09:13:04 -08:00
Eric Laurent
0163594301
Tentative fix for issue 3362362.
...
The problem is likely that one method is called on the AudioPolicyManagerBase
instance while it is still being constructed by AudioPolicyService.
To avoid this, the AudioPolicyService mutex is held by the constructor until the
platform specific AudioPolicyManager is constructed and the member
mpPolicyManager initialized.
Also added an initCheck() method to AudioPolicyInterface to verify successful
initialization of AudioPolicyManager.
A similar change is done in AudioFlinger constructor.
Also added some missing protections in AudioFlinger methods where the
playback thread list is parsed.
Change-Id: I006b244ec057e1bb0aa5ebe426ef006e3b171056
2011-01-19 09:04:27 -08:00
James Dong
08adfd29ae
Fix the presentation video resolution when it is different from the actual image resolution of the video.
...
bug - 3352413
Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
2011-01-19 08:33:07 -08:00
Kristian Monsen
40e7704182
am 710d5f45: am c40fc871: Need to sync the cache settings to native side
...
* commit '710d5f4591b6158f9a527e363aa4d589c39e9f71':
Need to sync the cache settings to native side
2011-01-19 08:09:48 -08:00
Kristian Monsen
710d5f4591
am c40fc871: Need to sync the cache settings to native side
...
* commit 'c40fc87147baffa2a71d66550a0f99ca2524f4b9':
Need to sync the cache settings to native side
2011-01-19 08:08:08 -08:00
Kristian Monsen
c40fc87147
Need to sync the cache settings to native side
...
Fix for cts tests
Change-Id: I554f1240c16b2c2e68810e54d0ff99d13288a6a8
2011-01-19 15:44:04 +00:00
Ben Murdoch
047eb0294e
am f80526d7: am 6e710b4f: Merge "Maintain the seek position in HTML5 video" into honeycomb
...
* commit 'f80526d772a53675cc288e16773c2ce5e0c3fd9a':
Maintain the seek position in HTML5 video
2011-01-19 07:43:12 -08:00
Ben Murdoch
f80526d772
am 6e710b4f: Merge "Maintain the seek position in HTML5 video" into honeycomb
...
* commit '6e710b4feb634f9e39c11ca1433d947bc1baab80':
Maintain the seek position in HTML5 video
2011-01-19 07:38:24 -08:00
Ben Murdoch
6e710b4feb
Merge "Maintain the seek position in HTML5 video" into honeycomb
2011-01-19 07:34:49 -08:00
Leon Scroggins
18ac58e056
am 5d3175e7: am 40777239: Make WebView inactive when title bar takes focus.
...
* commit '5d3175e704e3e86638f3317f0205491363bbee9f':
Make WebView inactive when title bar takes focus.
2011-01-19 06:46:28 -08:00
Leon Scroggins
5d3175e704
am 40777239: Make WebView inactive when title bar takes focus.
...
* commit '407772390f4a1b4e1196820ea22b9327eea54019':
Make WebView inactive when title bar takes focus.
2011-01-19 06:44:10 -08:00
Leon Scroggins
407772390f
Make WebView inactive when title bar takes focus.
...
Bug:3296938
Change-Id: I656e8582044acf3b0e9b417f41337833fe72c181
2011-01-19 09:41:06 -05:00
Ben Murdoch
ff19d19e01
Maintain the seek position in HTML5 video
...
Receive the current seek position from native when we start
playing a video. That way is we are returning from pause we correctly
continue where we left off.
Requires and external/webkit change.
(I6001f45a362f491e9040c8b52260d0a08fb8504f)
Bug:3303721
Change-Id: I6b92289d4ef36bba1e0429327917533a4101655d
2011-01-19 11:48:15 +00:00
Shih-wei Liao
1389364dce
am 388023a1: am b25de055: Merge "1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)" into honeycomb
...
* commit '388023a1e9c0a2f209c90dbeb7680d325cd267c8':
1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)
2011-01-19 02:29:19 -08:00
Shih-wei Liao
388023a1e9
am b25de055: Merge "1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)" into honeycomb
...
* commit 'b25de0558c4e5440982db53a220943a899390c90':
1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)
2011-01-19 02:25:25 -08:00
Shih-wei Liao
b25de0558c
Merge "1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)" into honeycomb
2011-01-19 02:23:01 -08:00
Shih-wei Liao
1ad9612e99
1. fp_mad.rs: Pass C99 check.
...
2. Include C99 header (Will be fixed later at build.git.)
Change-Id: I2864e081b2635dfc4fc0c85f746f6d0ce0b01af5
2011-01-19 02:18:45 -08:00
Winson Chung
875777d0b8
am adce48cc: am 7f447de2: Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb
...
* commit 'adce48ccba909e5d9c5595aef97460afd9d62834':
Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
2011-01-19 01:03:00 -08:00
Winson Chung
adce48ccba
am 7f447de2: Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb
...
* commit '7f447de2f511ec8ee35af8abf0ca3c46ffa68289':
Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
2011-01-19 01:00:36 -08:00
Winson Chung
7f447de2f5
Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb
2011-01-19 00:58:38 -08:00
Winson Chung
32cf193412
Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets.
...
Change-Id: Iee53d4930dc4007df4298a282cdd5101876215a1
2011-01-19 00:52:34 -08:00
Winson Chung
a726143937
am caedec76: am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb
...
* commit 'caedec768bf22acc38e526b9cec655ea8f9eede0':
Refactoring app widgets to address security/performance issues.
2011-01-18 23:08:11 -08:00
Winson Chung
caedec768b
am aac19783: Merge "Refactoring app widgets to address security/performance issues." into honeycomb
...
* commit 'aac197833f3b2deddc6b3da5c144be36721d9547':
Refactoring app widgets to address security/performance issues.
2011-01-18 23:05:38 -08:00
Winson Chung
aac197833f
Merge "Refactoring app widgets to address security/performance issues." into honeycomb
2011-01-18 23:04:01 -08:00
Winson Chung
81f39eb6e7
Refactoring app widgets to address security/performance issues.
...
- Moving the service binding to AppWidgetService to prevent arbitrary apps from binding to widget services
- Requiring RemoteViewsServices to require android.permission.BIND_REMOTEVIEWS permission
Change-Id: Id135bafba998299eb278067712b8a5d8487cfd04
2011-01-18 22:57:09 -08:00
Shih-wei Liao
d2d88bd3bc
am 888a0c94: am 9d30f754: Merge "Fix the build." into honeycomb
...
* commit '888a0c94e88fd32f067427b43dec3875bb029fb9':
Fix the build.
2011-01-18 22:55:39 -08:00
Shih-wei Liao
888a0c94e8
am 9d30f754: Merge "Fix the build." into honeycomb
...
* commit '9d30f75468b143724238e2cf00fcc7a2eeb2ba3f':
Fix the build.
2011-01-18 22:53:19 -08:00
Shih-wei Liao
9d30f75468
Merge "Fix the build." into honeycomb
2011-01-18 22:51:22 -08:00
Shih-wei Liao
cbb7279e7b
Fix the build.
...
Change-Id: I23c4146cb19540351c33b5823df25d6e2b204402
2011-01-18 22:50:18 -08:00
Hung-ying Tyan
a9ace46877
am 7eeecf10: am 9a07c990: Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb
...
* commit '7eeecf10e5adcb9c894a5c496b31720df5215d83':
Cherry-pick "Fix VPN notification helper" from master.
2011-01-18 22:43:39 -08:00
Hung-ying Tyan
7eeecf10e5
am 9a07c990: Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb
...
* commit '9a07c990d305243d1b9b8557fea96f273c46dc0f':
Cherry-pick "Fix VPN notification helper" from master.
2011-01-18 22:41:18 -08:00
Hung-ying Tyan
9a07c990d3
Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb
2011-01-18 22:39:20 -08:00
James Dong
7b8583427c
am 456570ef: am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
...
* commit '456570ef558d99200bdd9ffb80be22f157e17c53':
Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
2011-01-18 22:37:47 -08:00
Jim Miller
5cd80fca11
am 60ad6f0a: am 3355e18f: Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
...
* commit '60ad6f0ac0179fcb624f3bbf8aae0b850d0f75b0':
Fix 3356338: Add recovery text to AccountUnlockScreen
2011-01-18 22:37:32 -08:00
Hung-ying Tyan
f14491f696
Cherry-pick "Fix VPN notification helper" from master.
...
DO NOT MERGE
+ Show the ticker text only on the first time.
+ Keep static variables to avoid GC during connection.
Bug: 3292710
Change-Id: I8e97c792814404de0e36a2f9cc0022f41f723367
2011-01-19 14:36:22 +08:00
James Dong
456570ef55
am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
...
* commit '5fb60c7af2cbf59a99ae324c4284c7860b37c723':
Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
2011-01-18 22:09:21 -08:00
Stephen Hines
d04a8999bc
am dd8c9d68: am 688de88b: Fix bug in modf library function (plus typos).
...
* commit 'dd8c9d68f96805fcd47f7dfe7f6d365ea985e0f9':
Fix bug in modf library function (plus typos).
2011-01-18 22:03:41 -08:00
Adam Powell
820b1bc469
am dd4760a2: am d63d3358: Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
...
* commit 'dd4760a2cdbe7599d7b600a4b6bbbfb08bad3947':
Fix bug 3362258 - Fastscroll is out of sync with the list
2011-01-18 22:03:35 -08:00
Mike Lockwood
2294939a29
am 6b280468: am 2bc6971d: Merge changes I7df1ff78,Ibc2e8adf into honeycomb
...
* commit '6b280468f5216ac7e09ac83ddc6719fa27bb088c':
MediaScanner: Make sure name field is set for file based playlists
MTP: Fix problem with MTP starting up on the first try.
2011-01-18 22:03:21 -08:00
Romain Guy
268a79c10d
am 612ed43b: am 3cd030a4: Merge "Don\'t pass a null View to OnListItemClickListener. Bug #3365153 " into honeycomb
...
* commit '612ed43bc8bee58c8d6f80a53b607b64e2e00ab6':
Don't pass a null View to OnListItemClickListener. Bug #3365153
2011-01-18 22:03:13 -08:00