drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,765 Commits 1 Branch 0 Tags
Commit Graph

3605 Commits

Author SHA1 Message Date
James Dong
0a3dbf6f69 Merge "Fix the build break in git_master-without-vendor" into honeycomb 2011-01-18 13:26:14 -08:00
Mike Lockwood
b5f0871459 am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb 
* commit '26c1ab2e58f47ac94e638f69b9b626cc6b1925b6':
  MTP: Strip ".pla" file extension from name field for WMP playlists
 2011-01-18 13:17:27 -08:00
Mike Lockwood
26c1ab2e58 Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb 2011-01-18 13:14:58 -08:00
Mike Lockwood
8cc6eb1e4c MTP: Strip ".pla" file extension from name field for WMP playlists 
BUG: 3309324

Change-Id: Ia136f94406496f971819f4f805f742f2a6829007
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 13:13:05 -08:00
Dharmaray Kundargi
a1a55bbe94 Fix the build break in git_master-without-vendor 
Change-Id: I8fff5ee69958212a80711e0d86fb86514c8797f4
 2011-01-18 12:40:56 -08:00
Andreas Huber
63e99c39e1 am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb 
* commit '529fc53d3fd298ee5aef20e3a07bd263f7376b8d':
  Implement parsing of vbv buffering info in RTSP.
 2011-01-18 11:54:08 -08:00
Andreas Huber
529fc53d3f Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb 2011-01-18 11:52:02 -08:00
Bryan Mawhinney
6d7d0da9fb am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb 
* commit '3a4d547c588dc3a1abb48988595dc17874660bb8':
  Don't report 100% buffered when the stream ends prematurely.
 2011-01-18 11:31:51 -08:00
Bryan Mawhinney
3a4d547c58 Merge "Don't report 100% buffered when the stream ends prematurely." into honeycomb 2011-01-18 11:30:30 -08:00
Mike Lockwood
f9828f6584 am 0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb 
* commit '0de274b34c554a0e87b1071e001e41e416cd7678':
  MTP: Fix problems with modification dates for folders and non-media files
 2011-01-18 11:20:22 -08:00
Andreas Huber
77034e6393 Implement parsing of vbv buffering info in RTSP. 
Change-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a
related-to-bug: 3351915
 2011-01-18 11:19:13 -08:00
Bryan Mawhinney
e26275bdac Don't report 100% buffered when the stream ends prematurely. 
Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
 2011-01-18 19:12:21 +00:00
Mike Lockwood
7a0bd17bce MTP: Fix problems with modification dates for folders and non-media files 
Also removed an unnecessary parameter to MtpDatabase.endSendobject()

BUG: 3352142

Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 11:07:11 -08:00
Dharmaray Kundargi
b7d3312449 am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb 
* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
  Video editor API update - rework for Patch Set 3
 2011-01-17 11:40:27 -08:00
Dharmaray Kundargi
bf6ccb04b9 am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 
* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
 2011-01-17 11:40:16 -08:00
Dharmaray Kundargi
f7465eb652 am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb 
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
  videoeditor JNI files on honeycomb
 2011-01-17 11:40:11 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
 2011-01-17 10:53:06 -08:00
Dharmaray Kundargi
9ed99405ae Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Dharmaray Kundargi
307003a844 Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692. 
The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
 2011-01-17 10:36:12 -08:00
Dharmaray Kundargi
cd196d3727 videoeditor JNI files on honeycomb 
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
 2011-01-16 19:19:07 -08:00
Santosh Madhava
9bcedf7cf3 Video editor API update - rework for Patch Set 3 
Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
 2011-01-16 16:56:12 -08:00
Dharmaray Kundargi
3b3cddccc1 integrate videoeditor preview player. 
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
 2011-01-16 16:43:20 -08:00
James Dong
b3f4477389 am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb 
* commit 'e7df0ddee486f4705b17b4d8ed57ddbeb8b71943':
  Fixed thrashing in the cached buffer during 720p YT video streaming
 2011-01-14 19:22:26 -08:00
James Dong
ac0e4bdf05 Fixed thrashing in the cached buffer during 720p YT video streaming 
bug - 3340194

Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
 2011-01-14 15:15:12 -08:00
James Dong
089971eaba am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb 
* commit 'c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
  Add audio encoding parameters check
 2011-01-13 10:24:44 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Marco Nelissen
f679ba7d94 Cherrypick from GB. Do Not Merge. 
Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: I67deb044800a6cb626c69bf3d54d51df4bf830f2
 2011-01-13 07:17:20 -08:00
James Dong
54815a78af Add audio encoding parameters check 
bug - 3345296

Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
 2011-01-12 20:45:16 -08:00
James Dong
7f08308fda am 14bdce04: Merge "Remove legacy code that should not be used" into honeycomb 
* commit '14bdce0441378b766afca3eaa5ac78dbc2f7c6e1':
  Remove legacy code that should not be used
 2011-01-12 16:41:36 -08:00
James Dong
4507cef05e Remove legacy code that should not be used 
Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
 2011-01-12 16:38:45 -08:00
Marco Nelissen
18aa2da202 am a8a656b0: Fix scanning of modified files. 
* commit 'a8a656b0c595fa876a387a91f8813f88a2d3abe7':
  Fix scanning of modified files.
 2011-01-12 15:03:28 -08:00
Marco Nelissen
a8a656b0c5 Fix scanning of modified files. 
When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.

Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
 2011-01-12 14:46:49 -08:00
Andreas Huber
156a3c9ba7 am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb 
* commit '7928ca6f87af4b70086ecf75383ba43da37da891':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
 2011-01-12 14:35:46 -08:00
James Dong
999fb5a5a9 am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 
* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
  Publish MediaMetadataRetriever.java as public API
 2011-01-12 14:35:35 -08:00
Andreas Huber
7928ca6f87 Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb 2011-01-12 14:33:51 -08:00
James Dong
068b41d5d4 Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 2011-01-12 14:31:34 -08:00
Mike Lockwood
0b44f6f588 am 0dd9f4de: MediaScanner: Do not update the file path when updating records already in the database 
* commit '0dd9f4de3ed681e83bd79ddcd4fd463093d11ed3':
  MediaScanner: Do not update the file path when updating records already in the database
 2011-01-12 14:30:53 -08:00
Mike Lockwood
7ff08aeb7e am a2946433: Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 
* commit 'a29464335a1d164fde0817715d86ba6224d0a61f':
  Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
 2011-01-12 14:28:37 -08:00
Mike Lockwood
0dd9f4de3e MediaScanner: Do not update the file path when updating records already in the database 
The path should never change (media scanner treats renames as a delete and an insert)
and we want to preserve the mixed case paths in the database to avoid exposing the
lowercase squashing to MTP.

Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-12 17:27:37 -05:00
Mike Lockwood
a29464335a Merge "Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media" into honeycomb 2011-01-12 14:25:13 -08:00
James Dong
11eab056dd Publish MediaMetadataRetriever.java as public API 
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc

o part of a multi-project change.

bug - 2433195

Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
 2011-01-12 14:14:11 -08:00
James Dong
5df82ef953 am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb 
* commit 'cb0f6d0b42b264ec6aa2a98fe210d72ed10f73ed':
  Speed up MP3Extractor using cached reads
 2011-01-12 11:56:01 -08:00
James Dong
cb0f6d0b42 Merge "Speed up MP3Extractor using cached reads" into honeycomb 2011-01-12 11:54:32 -08:00
Andreas Huber
4bca5e19d5 Fail to parse duration instead of asserting, if the server response cannot be parsed. 
Change-Id: I42324468edca5ccce29486059091da8e64f36326
related-to-bug: 3338518
 2011-01-12 10:31:04 -08:00
James Dong
31d8a03e44 Speed up MP3Extractor using cached reads 
Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
 2011-01-12 09:49:15 -08:00
Mike Lockwood
1c4e88d0b0 Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media 
This rips out some complicated code that was added since gingerbread
that is no longer necessary.

Change-Id: Iab5ecb7314c06221475ce01ef483f34f17003b06
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-12 12:48:13 -05:00
Glenn Kasten
5ac80dde04 am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb 
* commit 'e5cf7f2bc51913d87bf97c8a1885f736edc5f0bc':
  Fix race in buffer ref counting.
 2011-01-12 09:36:00 -08:00
Glenn Kasten
4e26bc686b Fix race in buffer ref counting. 
Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
 2011-01-12 09:22:07 -08:00