Mike Lockwood
858caeaaa1
MediaScanner: Always use mime type provided to the media scanner
...
BUG: 3179926
Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-16 11:28:42 -05:00
Joe Onorato
b86c89c1a1
Merge "use the proper number of wifi icon levels."
2010-11-15 16:39:24 -08:00
Joe Onorato
09f686ec7e
use the proper number of wifi icon levels.
...
Change-Id: Ib8d4bccff7240d0086729093d79f564aa97001ff
2010-11-15 16:34:41 -08:00
Shimeng (Simon) Wang
20c14fd7b3
Ignore zoom overwidth updating when contentsize is not set.
...
This happens in case of layer's webkit draw time.
issue:3194817
Change-Id: I58c393d7553e279ccd4b4ee755e2da205faa069b
2010-11-15 15:54:53 -08:00
Joe Onorato
45c7af9725
Merge "Don't crash if we haven't gotten a signal strength yet."
2010-11-15 15:35:58 -08:00
Joe Onorato
801ade0f08
Don't crash if we haven't gotten a signal strength yet.
...
Bug: 3198447
Change-Id: I645b484eadfff6ed34517571b0c6fea3057ec563
2010-11-15 15:33:39 -08:00
Andreas Huber
7dcf95af05
Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."
2010-11-15 15:31:17 -08:00
Adam Powell
a752468e26
Merge "Fix bug 3176330 - Improve documentation around MenuItem.setShowAsAction"
2010-11-15 15:26:31 -08:00
Gilles Debunne
9947b32185
Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread"
2010-11-15 15:23:01 -08:00
Adam Powell
965b9699f1
Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread
...
DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over
extract mode IME window
Make the SelectionModifierCursorController track its show/hide state
more accurately in the presence of an extract mode IME.
Lazily initialize CursorControllers so that we don't end up creating
them for various TextViews where they are not needed.
Change-Id: I3dce7535db3a1bd25ed9899406de47b00058e665
2010-11-15 15:21:15 -08:00
Adam Powell
759dc706ba
Fix bug 3176330 - Improve documentation around MenuItem.setShowAsAction
...
Change-Id: Ibc8babd3668d0d8e1ed50ac330aac06a4f57dc1e
2010-11-15 15:12:20 -08:00
Andreas Huber
0f62458434
Proper support for variable NALsize lengths of AVC content in .mkv files.
...
Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929
related-to-bug: 3197442
2010-11-15 15:10:34 -08:00
Joe Onorato
c7bc3d09bd
Merge "Don't cancel the key buttons when you drag outside their bounds."
2010-11-15 13:32:43 -08:00
James Dong
835ea2f2c9
Merge "Fixed a race condition where some recording frames may not be released."
2010-11-15 13:31:54 -08:00
Joe Onorato
abb27777f4
Don't cancel the key buttons when you drag outside their bounds.
...
Bug: 3183205
Change-Id: I9e0f2e4e550b3e5b1b46099145b4c703b77aca77
2010-11-15 13:30:49 -08:00
Wink Saville
47ea7c43da
Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory."
2010-11-15 13:24:37 -08:00
Vasu Nori
7f7b9fd000
Merge "map _data column to local_filename column. bug:3197501"
2010-11-15 13:24:23 -08:00
Mathias Agopian
69e2d97ab1
am f11bf284: am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
...
* commit 'f11bf284d355e2a8378c6a37a7ed702705ec6144':
Fix a race condition in sensormanager
2010-11-15 13:22:16 -08:00
Mathias Agopian
dab0014acc
am 99866c11: am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
...
* commit '99866c111bd72a6cc9be17b127cd40ec9396ca7d':
Revert "allow all 4 orientations"
2010-11-15 13:22:13 -08:00
Mathias Agopian
f11bf284d3
am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
...
* commit '305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
2010-11-15 13:19:46 -08:00
Mathias Agopian
99866c111b
am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
...
* commit '9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
2010-11-15 13:19:43 -08:00
Derek Sollenberger
dd97f0cb41
Merge "Only show double-tap tip if the feature is enabled."
2010-11-15 13:19:37 -08:00
James Dong
df7a856d3d
Fixed a race condition where some recording frames may not be released.
...
When startRecording() is called before setListener(), recording frames
are sent right after startRecording(), but there is no listener to
release the recording frames. This causes the hang in media server.
bug - 3166356
Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
2010-11-15 13:14:59 -08:00
Mathias Agopian
305bc0fe97
Merge "Fix a race condition in sensormanager" into gingerbread
2010-11-15 13:14:59 -08:00
Mathias Agopian
9e291a4b99
Merge "Revert "allow all 4 orientations"" into gingerbread
2010-11-15 13:14:50 -08:00
Vasu Nori
e69924f0d0
map _data column to local_filename column. bug:3197501
...
this bug is caused by Change-Id: Ief1693785f0484c1b434fb41a68693f9aff96492
Change-Id: Id654322d587968f50aecc7d965b8d7a8d78ce50d
2010-11-15 13:10:11 -08:00
Joe Onorato
64f1163084
Merge "The beginnings of the new status bar."
2010-11-15 12:23:51 -08:00
Wink Saville
6b888d98f7
Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory.
...
Change-Id: Ifa0f14aad3fee7cad47cdf762c6cff457b56a473
2010-11-15 12:16:52 -08:00
James Dong
df3191cb88
Merge "Switch to use kKeyFrameRate for recordvideo utility"
2010-11-15 12:13:08 -08:00
Joe Onorato
fd52b18d9b
The beginnings of the new status bar.
...
There is a lot of rough stuff still, but most of the functionality is here again.
Change-Id: I4b1241e61270f1434e798481afa83634233ee670
2010-11-15 11:52:33 -08:00
Brad Fitzpatrick
5548758d33
Merge "Close some things in system_server that CloseGuard found."
2010-11-15 11:31:05 -08:00
Mike Lockwood
160b977c81
Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList"
2010-11-15 11:27:47 -08:00
Brad Fitzpatrick
725d8f06ec
Close some things in system_server that CloseGuard found.
...
Change-Id: I788c022235caddcb1972a34131442a683cd51eb5
2010-11-15 11:12:42 -08:00
Kenny Root
b763fa1d7c
Merge "Split UTF functions from String8/16"
2010-11-15 11:11:22 -08:00
Mike Lockwood
3159991e58
MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList
...
Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-15 14:10:04 -05:00
Adam Cohen
ee4a7d8682
Merge "Fix for Issue: 3196583"
2010-11-15 11:09:59 -08:00
Adam Cohen
490127df19
Fix for Issue: 3196583
...
Change-Id: I7878cf41274d4f5885d6179f3072a3be05386075
2010-11-15 11:08:03 -08:00
Wink Saville
4543e0de20
Merge "Add html formatting to AsyncChannel & Hsm class comments."
2010-11-15 11:00:49 -08:00
Wink Saville
33c54e3365
Add html formatting to AsyncChannel & Hsm class comments.
...
Change-Id: Ic42fdb4e8970166a92f173317210353ab8a2fa6a
2010-11-15 10:50:34 -08:00
Brad Fitzpatrick
9f07da18e4
Merge "Disable CloseGuard early. (it defaults to spammy otherwise)"
2010-11-15 10:47:49 -08:00
Brad Fitzpatrick
e139bc944c
Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"
2010-11-15 10:47:32 -08:00
Andreas Huber
645336a742
Merge "More HTTP live support, AES encryption etc."
2010-11-15 10:07:38 -08:00
Andreas Huber
d98f49b014
Merge "Refactor h.264 profile/level support into avc_utils."
2010-11-15 10:07:31 -08:00
Andreas Huber
ffd998e744
Merge "Provide bandwidth estimation support in NuHTTPDataSource"
2010-11-15 10:07:24 -08:00
Andreas Huber
81a602958f
Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
2010-11-15 10:07:17 -08:00
Adam Cohen
c86b5a6af9
Merge "Adding click feedback to StackView"
2010-11-15 10:05:58 -08:00
James Dong
93248f8160
Merge "Remove legacy PV stuff"
2010-11-15 09:57:33 -08:00
Mike Lockwood
5d5b0a32a9
Merge "MTP: Partial implementation of the GetObjectPropList command"
2010-11-15 09:51:10 -08:00
Bryan Mawhinney
c0aaccc485
Add support for integer mod.
...
Change-Id: I681b8220c8b39d865ade036a93ba93a965e259c9
2010-11-15 17:43:12 +00:00
Andreas Huber
2381a8a91b
Provide bandwidth estimation support in NuHTTPDataSource
...
Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29
related-to-bug: 2368598
2010-11-15 09:35:54 -08:00