James Dong
b61296c763
am 6df89f2e: am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
...
* commit '6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
Expose average video frame rate via MPEG4Extractor
2011-01-19 10:32:58 -08:00
James Dong
6df89f2efc
am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
...
* commit '8e7d626385eef104d52aa9080b70395ca840a0cd':
Expose average video frame rate via MPEG4Extractor
2011-01-19 10:31:06 -08:00
James Dong
8e7d626385
Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
2011-01-19 10:29:04 -08:00
Leon Scroggins
a09fddc555
am 60964579: am b90bd293: Merge "Only scroll on screen when necessary." into honeycomb
...
* commit '60964579fe9c56bfac21a91dbb2355b1086e47b6':
Only scroll on screen when necessary.
2011-01-19 10:28:32 -08:00
Mike Lockwood
1dc638e316
am 216a7b97: am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
...
* commit '216a7b97ebedc6886d98a117fcfe0b83891e5e45':
MTP: Close and reopen driver file after an error.
2011-01-19 10:26:30 -08:00
Leon Scroggins
60964579fe
am b90bd293: Merge "Only scroll on screen when necessary." into honeycomb
...
* commit 'b90bd293c2a8f2bb68f5cbd63966ea1739814e7d':
Only scroll on screen when necessary.
2011-01-19 10:25:52 -08:00
Leon Scroggins
b90bd293c2
Merge "Only scroll on screen when necessary." into honeycomb
2011-01-19 10:23:52 -08:00
Mike Lockwood
216a7b97eb
am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
...
* commit 'dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
MTP: Close and reopen driver file after an error.
2011-01-19 10:23:44 -08:00
James Dong
cbb488d678
Expose average video frame rate via MPEG4Extractor
...
bug - 3362483
Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
2011-01-19 10:20:59 -08:00
Mike Lockwood
dc80b7ec05
Merge "MTP: Close and reopen driver file after an error." into honeycomb
2011-01-19 10:20:38 -08:00
Leon Scroggins
3be1ffab08
Only scroll on screen when necessary.
...
Bug:3367446
bringPointIntoView was called by TextView in onPreDraw. This was
passing a message to the webcore thread to change the scroll
position. This is unnecessary, because typically the scroll
position will be changed by webkit when keys are pressed. The
one situation where this helped was when the user taps on a
textfield, which brings up the IME, which may cover it. A better
solution is to tell webkit to scroll it on screen once the
screen size changes. I have a CL in external/webkit to do that:
https://android-git.corp.google.com/g/#change,91095
Change-Id: I6e06ad59e1a1c99365bb5be635a43d1b88658c0d
2011-01-19 13:18:59 -05:00
Mike Lockwood
897f894e88
MTP: Close and reopen driver file after an error.
...
BUG: 3368665
Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 10:11:28 -08:00
James Dong
a2a3ea5dda
am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
...
* commit '1324e3b1a4246f77d516b37fa98013ffad91268e':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
2011-01-19 10:09:01 -08:00
James Dong
1324e3b1a4
am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
...
* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
2011-01-19 10:06:23 -08:00
James Dong
4061c9aa6d
Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
2011-01-19 10:05:05 -08:00
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