Romain Guy
c7816cd6a1
Merge "Don't let toasts "leak" Context instances." into honeycomb
2011-01-19 11:33:43 -08:00
Andreas Huber
71bb6a2a3e
Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
2011-01-19 11:31:44 -08:00
Mathias Agopian
a0bafb4713
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
2011-01-19 11:31:07 -08:00
Andreas Huber
283e031d11
Always revert to the previous bandwidth if the required sequence number cannot be found
...
Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
2011-01-19 11:30:43 -08:00
Andreas Huber
0cf2616fac
Return a runtime error if decryption fails instead of asserting.
...
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
2011-01-19 11:24:39 -08:00
Dianne Hackborn
7666ebd9f2
Merge "Bee seeing you..." into honeycomb
2011-01-19 11:16:38 -08:00
Romain Guy
c4d09f2b69
Don't let toasts "leak" Context instances.
...
Change-Id: I05a936579e60360cdb3453ad5cbcead8ca03191a
2011-01-19 10:55:19 -08:00
Mike Lockwood
54973710d7
Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
2011-01-19 10:40:56 -08:00
Andreas Huber
069ee21a20
Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
2011-01-19 10:38:16 -08:00
Romain Guy
fdbec3e482
Fix 9patches in Launcher
...
Change-Id: Ieedf36ccaab253909b44ed8c222d523867f095be
2011-01-19 10:37:35 -08:00
Romain Guy
49903d265b
Merge "Fix 9patches in Launcher" into honeycomb
2011-01-19 10:35:46 -08:00
Andreas Huber
d95b46a1d1
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
...
Refactor the logic a little.
Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
2011-01-19 10:34:52 -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
b90bd293c2
Merge "Only scroll on screen when necessary." into honeycomb
2011-01-19 10:23:52 -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
Mike Lockwood
70ee3ca616
Environment.isExternalStorageRemovable() is false if external storage is emulated
...
Change-Id: Ib1afe83e4295d8304b65e822edd0dfa1591a5be7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-19 10:19:12 -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
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
2597aedb38
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
2011-01-19 09:49:32 -08:00
Eric Laurent
42466b1cad
Merge "Tentative fix for issue 3362362." into honeycomb
2011-01-19 09:40:34 -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
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
Andreas Huber
e9a00235c1
Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
2011-01-19 08:11:39 -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
6e710b4feb
Merge "Maintain the seek position in HTML5 video" into honeycomb
2011-01-19 07:34:49 -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
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
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
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
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
9a07c990d3
Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb
2011-01-18 22:39:20 -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
5fb60c7af2
Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
...
bug - 3361771
Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
2011-01-18 21:33:58 -08:00
Jim Miller
3355e18f68
Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
2011-01-18 21:14:38 -08:00
Stephen Hines
688de88b65
Fix bug in modf library function (plus typos).
...
Change-Id: I643c905e2e3e2dcf7a61f1d027b749d9a0d6e542
2011-01-18 21:04:59 -08:00
Adam Powell
d63d335810
Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
2011-01-18 20:44:44 -08:00
Adam Powell
b1f498afc3
Fix bug 3362258 - Fastscroll is out of sync with the list
...
Change-Id: I13282bfed355f5794041e83818ee2e9e97c1b318
2011-01-18 20:44:01 -08:00
Mike Lockwood
2bc6971dd8
Merge changes I7df1ff78,Ibc2e8adf into honeycomb
...
* changes:
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 20:30:13 -08:00
Mike Lockwood
242d0cdc1a
MediaScanner: Make sure name field is set for file based playlists
...
Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 20:29:08 -08:00
Romain Guy
3cd030a4fe
Merge "Don't pass a null View to OnListItemClickListener. Bug #3365153 " into honeycomb
2011-01-18 20:27:22 -08:00
Romain Guy
7890fe2da4
Don't pass a null View to OnListItemClickListener.
...
Bug #3365153
Change-Id: I1328a554408bf16ec592ae1a747e57a5fb9305e3
2011-01-18 20:24:18 -08:00