Commit Graph

890 Commits

Author SHA1 Message Date
Mike Lockwood
63de615ddb am 36132a48: DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
* commit '36132a488b2974db9a90da809c2f3eeab99a4427':
  DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
2011-05-04 08:57:59 -07:00
Mike Lockwood
f6df5b41e1 am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
* commit 'fb6232635d339c83ca100e472b159f103dafb6e2':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
2011-05-04 08:57:37 -07:00
Marco Nelissen
863ee40964 am 7dd59229: DO NOT MERGE Fix media scanner uri handling.
* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
  DO NOT MERGE Fix media scanner uri handling.
2011-05-04 08:57:33 -07:00
Mike Lockwood
36132a488b DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
This will prevent MediaProvider from adding these files to the images table

Change-Id: Ice4756b64a067f3aceff08ab2c5e91665109dde5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:21 -04:00
Mike Lockwood
fb6232635d DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: Ib707f329be98878501952b6054998518a6eabbbd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Marco Nelissen
7dd592298a DO NOT MERGE Fix media scanner uri handling.
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ie589c9b52b436d73e295609d21238b2b3e829502
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-04 10:41:20 -04:00
Brad Fitzpatrick
0ddcc8bc60 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-30 08:20:58 -07:00
Christer Fletcher
375fb9bfd2 Handle OutOfMemoryError when decoding images in ThumbnailUtils
Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.

Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
2011-03-28 14:47:55 +02:00
Rajneesh Chowdury
0edefea88e Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 2011-03-16 16:03:15 -07:00
Rajneesh Chowdury
8e7991a52e Fix for 4087846 Crash reported by monkey report (Java/Jni)
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
2011-03-15 16:20:17 -07:00
Shailendra Yadav
3fabad87f6 Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1 2011-03-14 17:23:05 -07:00
Shailendra Yadav
4d0ec22aa9 Fix for Don't allow adding 64-bit files(4086708)
Change-Id: I880c89b565dd8172fdf077a514d5b3d03eab7d9e
2011-03-14 15:07:05 -07:00
Eric Laurent
fa640154f1 Partial fix for issue 3515250: video chat and SCO
Do not call directly into AudioSystem in setBluetoothScoOn() but
send a message to the AudioService handler instead. As the
procedure to switch audio path to BT SCO can last some time we should
not block the caller which can run in the UI thread.

Change-Id: I6ac4b5a934d69781db3aebe5d0e8137b52a0ada4
2011-03-12 15:59:51 -08:00
Rajneesh Chowdury
a7118e33b4 Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1 2011-03-10 15:10:39 -08:00
Rajneesh Chowdury
e7defc2975 Fix for 4080402 NPE in Transition.setDuration
Change-Id: I1e4499e3191beafdaf9bb4b7fd51798bd1eab300
2011-03-10 10:35:42 -08:00
Jean-Michel Trivi
5fa7aac81b Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1 2011-03-09 10:18:31 -08:00
Jean-Michel Trivi
382f4e6ea4 Fix bug 4064086 Use a death handler on audio focus changes from mode
Use a death handler when audio focus changes are caused by audio
 mode changes.

The bug comes from the fact that audio focus clients that use the
 audio mode for automatic focus handling didn't register a death
 handler, which was set to null. When such a client died, this
 handler was compared against the one to remove from the
 audio focus stack, which resulted in an NPE.
The fix consists in registering a valid IBinder object in the
 audio focus stack, even for clients whose focus requests originate
 from a change in audio mode, as implemented in the
 handleFocusForCalls() method.

Change-Id: Id9e1d3d10afcd99969285f6d60fc4d7dde1e4a10
2011-03-08 15:12:26 -08:00
Santosh Madhava
895a28e14e Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
Change-Id: I376483c42b5bed8d2a1765804c2261c18d720a0c
2011-03-04 18:37:51 -08:00
Ray Chen
a2c322f599 3406494 Gallery photos in nonsensical order
Change-Id: Ic992465a6683179bff280753dcaf9aa6372424e6
2011-03-03 15:04:57 +08:00
Santosh Madhava
7256a7c525 Fix for issue 3495914: (In Java) Video clip switches between start and end
Change-Id: Ie5ea83c61c6c008162abea76e15d745a901a1e23
2011-03-01 21:36:31 -08:00
Santosh Madhava
9e69035598 Merge "Fix for issue 3466385: Low quality video properties are applied to all" 2011-02-28 11:06:55 -08:00
Eric Laurent
65260be5d4 Merge "Fix issue 3388354." 2011-02-28 09:53:04 -08:00
Eric Laurent
854938a72d Fix issue 3388354.
Release all sco audio clients when the intent indicating
STATE_AUDIO_DISCONNECTED state is received.
Also clear mScoClients array when clients are released.

Change-Id: I63ec9d70fe72a102e09a4a473a367fb2e550b171
2011-02-28 09:13:00 -08:00
Rajneesh Chowdury
f67441eb37 Instrumentation code to enable/disable memory leak check using setprop
The heap memory dump is enabled when libc.debug.malloc property is 1.
Two .dump files are created in predefined path.

Memory leak report can be generated using nativeheapdump tool.

Change-Id: Ie03928b5a05993e72d4700a158657c514478ecd3
2011-02-27 20:59:12 -08:00
Santosh Madhava
bcbf68583e Fix for issue 3466385: Low quality video properties are applied to all
Change-Id: Idcae85d88de65bae549263f9c43a6f3020dd63a1
2011-02-27 17:37:23 -08:00
Santosh Madhava
89782f5013 Fix for issue 3485010: The project thumbnail is not regenerated
Change-Id: I2c882bdf2e82b95b1ad19ab50ec636a78b1c1561
2011-02-24 15:12:11 -08:00
Glenn Kasten
cc562a3576 Bug 3438258 Add SurfaceTexture as MediaPlayer sink
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
 - New Java and C++ interfaces
 - C++ plumbing and implementation (JNI, Binder)
 - Stagefright AwesomePlayer and NuPlayer use ANativeWindow
   (either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
2011-02-23 15:02:56 -08:00
Santosh Madhava
bba9529d79 Merge "Cleanup for issue 3471160 : video editor calls System.gc" 2011-02-23 09:59:07 -08:00
Gloria Wang
87e639bc15 Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data" 2011-02-23 09:58:33 -08:00
Gloria Wang
d211f41f76 - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
2011-02-22 22:42:05 -08:00
James Dong
9a146d9d65 am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit 'd97c598ff4d902583f9083960b088b31350d0018':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:41:25 -08:00
James Dong
d97c598ff4 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:15:19 -08:00
Santosh Madhava
3f48207ea4 Cleanup for issue 3471160 : video editor calls System.gc
Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
2011-02-22 20:19:38 -08:00
Mike Lockwood
16dc3073a2 Don't treat WMV and ASF files as video files unless WMV is supported
Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-22 17:49:00 -08:00
James Dong
14460b9564 Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
bug - 3040402

Change-Id: I455d2a664851c73212711e8c4b88e97b50ee5b62
2011-02-22 13:45:57 -08:00
Rajneesh Chowdury
dab9689491 Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash" 2011-02-22 10:50:21 -08:00
Rajneesh Chowdury
06a087a52b Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash
Change-Id: Ib257484ff8646b8e6a0a6a4bb9b937d5338c060c
2011-02-21 17:46:41 -08:00
Santosh Madhava
df4723ef3c Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
2011-02-16 22:32:02 -08:00
Basavapatna Dattaguru
699587da4b VideoEditor:Inconsistance defines:Issue ID:3419090
Assigned with MediaProperties array values

Change-Id: I97efa98954eb1be3b21a9e42b989def6bb657d77
2011-02-14 17:50:32 -08:00
Basavapatna Dattaguru
b27a1ca53e Merge "VideoEditor: Fixes Issue ID:3448077" 2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
4eb7a98342 VideoEditor: Fixes Issue ID:3448077
Updated with review comments. checks width & height

Change-Id: I79bd28862f511e7653e7e7a63c88772834ee6559
2011-02-11 18:03:01 -08:00
Basavapatna Dattaguru
2b06e56031 VideoEditor: Populate profile&level: Issue:3419090
Updated with new values for Profiles and levels

Change-Id: Ib0abcab1be741c151ce44b54eb1deff64828af00
2011-02-11 17:18:54 -08:00
Glenn Kasten
8132a8caf3 Merge "Bug 3352047 Wrong message when adjusting volume" 2011-02-10 15:27:59 -08:00
Glenn Kasten
8b4b97a14a Bug 3352047 Wrong message when adjusting volume
Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
2011-02-10 14:37:42 -08:00
Eric Laurent
04f7861cfa Merge "Fix issue 3435692" 2011-02-10 14:01:27 -08:00
Eric Laurent
a25c5d88d1 Fix issue 3435692
The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.

The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.

Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
2011-02-10 13:24:04 -08:00
Marco Nelissen
cb613a04c1 Better genre support.
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
2011-02-10 12:09:16 -08:00
Dharmaray Kundargi
3ec816ba61 am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
  Fix issue 3426489 Overlay background changed when exported
2011-02-07 13:50:31 -08:00
Dharmaray Kundargi
88928ffc1c am 73edcfe8: am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
* commit '73edcfe8f4678c4d5e91c8018e00a72ea325da71':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
2011-02-07 13:49:38 -08:00
Eric Laurent
b82d4570d9 am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
  Issue 3395734: fix media server restart detection
2011-02-07 13:49:16 -08:00