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
Mathias Agopian
305bc0fe97
Merge "Fix a race condition in sensormanager" into gingerbread
2010-11-15 13:14:59 -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
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
Eric Rowe
23c067692b
Add acceptPair method to BT stress.
...
Add a method to the test utils which waits to accept a bonding request from
another device. This is identical to the pairing method except that it
waits for a remote pair request instead of initiating the pairing
request itself. Also, add a test method to the test utils.
Change-Id: I97e215d3412d4b61757d6dc011b90cc5f2c8f084
2010-11-15 12:18:23 -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
Justin Ho
e70e78103a
am b9d3e359: (-s ours) am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit 'b9d3e35907e6b7e2c766f4813ab2e0463c920c37':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:16:13 -08:00
Justin Ho
b9d3e35907
am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit '868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:13:16 -08:00
Justin Ho
868889fb41
Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
2010-11-15 09:10:33 -08:00
Justin Ho
ee6aa806d8
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
...
Change-Id: I6220c0b9f85b20c690437a23c364ad4898b8e16a
2010-11-15 09:07:34 -08:00
Andreas Huber
6a1f5f90e4
More HTTP live support, AES encryption etc.
...
Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c
related-to-bug: 2368598
2010-11-15 09:03:03 -08:00
Andreas Huber
f7e2e31f7a
Refactor h.264 profile/level support into avc_utils.
...
Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358
related-to-bug: 2368598
2010-11-15 09:01:13 -08:00
Justin Ho
5b4faa4da0
am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'dc04f53703f68f0a4fb13858cbf71b760cf48368':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:57:11 -08:00
Andreas Huber
5dffd0e3af
Add http live mime types to MediaFile, add support for playlist mime types to browser.
...
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
2010-11-15 08:54:40 -08:00
Justin Ho
dc04f53703
am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:53:56 -08:00
Justin Ho
a5c4aeba1c
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
2010-11-15 08:50:19 -08:00
Brad Fitzpatrick
4d9e6d2bc2
Disable CloseGuard early. (it defaults to spammy otherwise)
...
We already selectively enable it later when desired.
Change-Id: Ic428f13a57a2b4340ce343e73c32413b64fcd1af
2010-11-15 08:49:51 -08:00