3687 Commits

Author SHA1 Message Date
Mike Lockwood
8719c406c3 DO NOT MERGE: MTP: Disable MTP when the keyguard is locked and secure
BUG:  3402847

Change-Id: Id0e20597423131a13ac7cef13ec5c39b962b3e0b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:33:07 -05:00
Mike Lockwood
0600fff914 DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
BUG: 3402847

Change-Id: I46e90f546a8d72c273cd7f2de2d086bb6dbdc1b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-26 14:32:45 -05:00
Andreas Huber
06572b9abd DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
Squashed commit of the following:

commit b1732e9b8bfea4c99bd07907c9aac9fcf1e8b264
Author: Andreas Huber <andih@google.com>
Date:   Thu Feb 24 12:05:40 2011 -0800

    DO NOT MERGE: Alternate patch for late video issue: seek only the video ahead to the next

    syncframe after the current audio media position, leave audio untouched.

    Change-Id: I4f6eb4e577147bc12ed2e998bea299f4bcfaf936
    related-to-bug: 3375737

commit 5e7282cf0b5c7a613da5e65fd6c8cb33a1058f8e
Author: Andreas Huber <andih@google.com>
Date:   Fri Feb 11 13:09:36 2011 -0800

    DO NOT MERGE: Start playing (and decoding) audio only after the first video frame has been decoded.

    if there's both audio and video content. This gives the video decoder an opportunity
    to fill its internal buffer queue at the start of playback.

    Change-Id: If17c4243546b1c27c8e5ee43941654d0e36f5ee5
    related-to-bug: 3431702

Change-Id: Ic3a6be467ff7ad09da04b1d2bb1a692ee38002b4
2011-02-25 09:13:53 -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
Dharmaray Kundargi
ab280b8db6 Fix issue 3426489 Overlay background changed when exported
Change-Id: I53d05732f6de6363cfb64fc84b2539e957adfcd6
2011-02-04 18:23:20 -08:00
Dharmaray Kundargi
b894f8959c Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 2011-02-04 17:01:51 -08:00
Danny Fernandes
6ef407c0e6 Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb 2011-02-04 16:52:10 -08:00
Eric Laurent
d4b88c8829 Merge "Issue 3395734: fix media server restart detection" into honeycomb 2011-02-04 16:30:03 -08:00
Eric Laurent
086396a924 Issue 3395734: fix media server restart detection
Commit 25101b0b in AudioSystem for issue 3395734 broke the mechanism
in AudioService to poll and detect the restarting of media server
process after a crash.

The fix consists in changing the method used to poll AudioSystem and
trigger a callback indicating success when media server is responding
(the method must be on IAudioFlinger and not IAudioService to trigger the callback).

Change-Id: I843c0194de9cbf82c779cabbf2f3cbf8064603c8
2011-02-04 16:22:57 -08:00
Danny Fernandes
69e868dcab Fixed 3423072 Imported 1080x720 video clips present distorted view
Change-Id: If4f4039c516eb77423dd590e8634a2d4a05d4622
2011-02-04 16:08:07 -08:00
Dharmaray Kundargi
0d99f5a95c Fix issue 3426200 Movie Studio crashes when a media item is deleted
Change-Id: I1149fbfd22b44b388897bbcc6970da74c1f6ac4f
2011-02-04 15:46:09 -08:00
Eric Laurent
2e96f15d8c Merge "Fix issues 3425035 and 3423785." into honeycomb 2011-02-04 14:06:40 -08:00
Danny Fernandes
7b3f26328b Fixed 3419090 Throwing exception for unsupported video codec profiles and level
Change-Id: I89e8723a6b89338ecedcfabf8b0c63ed2f7e9468
2011-02-04 12:45:31 -08:00
Eric Laurent
402f7f2963 Fix issues 3425035 and 3423785.
- Make sure that STREAM_MUSIC is affected by ringer mode on non voice capable
devices whatever the saved settings say.

- Added a hidden method to AudioManager for VolumePanel to override
the stream selection logic while the panel is showing.

Change-Id: Ib2ff2a7af63decb4e29c45700c41e5058f79d877
2011-02-04 12:39:14 -08:00
Dheeraj Sharma
67ec9aa878 Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
Change-Id: Ie9cf769e42869b5cab57694e92884900d33f40d9
2011-02-04 02:31:45 -08:00
Dheeraj Sharma
b62d78bd0d Modification for using Software decoder for thumbnail generation in JNI
Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
2011-02-03 23:20:07 -08:00
Gil Dobjanschi
3f1c573940 Bug fix: 3421011 ANR during delete video clip
Change-Id: I9ba027619d611d76f41d9430a4ad3c9ee5211711
2011-02-03 17:18:17 -08:00
Eric Laurent
9c0a1003bd Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00
Eric Laurent
25101b0b9a Fix issue 3371080
Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
2011-02-03 09:26:24 -08:00
Dheeraj Sharma
13984592b1 Fix for issue : 3419353 Crash during transition generation
Change-Id: I1f15f05c87bdc1ad8acdb6fc5db3c350e5b28947
2011-02-02 23:26:30 -08:00
Gil Dobjanschi
29206e9175 Bug fix: 3419287 Deleted images and video clips invalidate the entire project
Change-Id: I9dcc3b9fa0574fefe688c1616e69ba37811bde51
2011-02-02 22:02:20 -08:00
Dharmaray Kundargi
a3f87f855b Fix issue 3412777 ANR on adding effects.
Change-Id: Id3c480a8261423412a99375f71cf6ee585b6c22b
2011-02-02 13:09:08 -08:00
Dharmaray Kundargi
261ddb8120 Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb 2011-02-02 11:14:33 -08:00
Dharmaray Kundargi
beb9fc8ee8 Fix issue 3408285 Crash while generating KenBurns
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
2011-02-02 03:25:01 -08:00
Santosh Madhava
63298a9809 Fix for issue 3370023 : Wrong aspect ratio in overlay
Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
2011-02-02 01:38:45 -08:00
Dharmaray Kundargi
c08f85a648 Fix issue 3414805 Crash during Overlay editing. JNI fixes.
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
2011-02-01 20:19:16 -08:00
Dheeraj Sharma
8afee6694b Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
Change-Id: Ice53fb284e029b1d22093048e8343f9ce8d853dd
2011-02-01 00:28:55 -08:00
Dheeraj Sharma
178d4f4111 Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
Change-Id: Iddd1b9b2c430439c4bef4f1cf20fb166ac572d60
2011-01-31 21:25:46 -08:00
Dharmaray Kundargi
327549f996 Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb 2011-01-31 19:01:13 -08:00
Dharmaray Kundargi
a573b563b3 Fix issue 3408285. Fix issue in Thread safe in Java.
Change-Id: Ifddcecfc2d7b1bd3e8a91c4850c169e1fb7c65ae
2011-01-31 17:54:55 -08:00
Andreas Huber
17ab86cdb1 Disconnect HTTP live sessions as soon as the request comes in.
Instead of waiting until pending events have been processed.

Change-Id: Id758f5508a514561e18aade82175d69e9156965e
related-to-bug: 3409681
2011-01-31 16:18:49 -08:00
Gil Dobjanschi
2bb13573d6 Bug fix: 3405930 Crash editing overlay text
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
2011-01-31 03:57:15 -08:00
Dheeraj Sharma
cd73d1ed6d Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 2011-01-30 18:12:25 -08:00
Dharmaray Kundargi
4e70320521 Merging the same files on top of tree.
Add support for .m4v Issue 3395600

Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
2011-01-30 16:17:53 -08:00
Dheeraj Sharma
45911e1969 Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 2011-01-30 15:20:49 -08:00
Dheeraj Sharma
167e7488af Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 2011-01-30 15:08:12 -08:00
Dheeraj Sharma
c1a2f40005 3404665 Preview window is blank after returning from playing exported movie
Change-Id: Idf2719953cbaf41e09eaf86de37e3459a1ea4aed
2011-01-30 14:52:42 -08:00
Dheeraj Sharma
9803b8435e Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
2011-01-30 12:50:23 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Dheeraj Sharma
5618e037af Fix for issue 3404671 Crash when exporting movie in JNI
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
2011-01-29 21:29:49 -08:00
Marco Nelissen
cc2915c0b1 am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
  Increase the number of useful bits in the spectrum.
2011-01-29 09:32:05 -08:00
Andreas Huber
d916339e2f Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1.

Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719
related-to-bug: 3392386
2011-01-28 10:30:56 -08:00
Andreas Huber
a2edd7d8d1 More robust parsing of NPT time ranges in RTSP.
Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3
related-to-bug: 3217210
2011-01-28 09:36:38 -08:00
Jean-Michel Trivi
834662d422 Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
When the user is in a phone or VoIP call, the volume keys should
 control the STREAM_VOICE_CALL volume. Before MODE_IN_COMMUNICATION
 was introduced to cover VoIP use cases, having an active VoIP call
 was determined by checking whether there was any track used the
 output stream STREAM_VOICE_CALL, which can give false positives.
This CL checks instead against the audio mode to see if
 MODE_IN_COMMUNICATION is selected to determine if a VoIP call
 is in progress.

This implies that applications that play on STREAM_VOICE_CALL
 shouldn't rely on that fact alone to expect the volume keys
 to control the STREAM_VOICE_CALL volume, and should instead,
 rely on the official mechanism for that:
   android.app.Activity.setVolumeControlStream(int)

Change-Id: Ia487951ea1684477aa3d522c9031fad484d8a40d
2011-01-27 17:54:13 -08:00
Santosh Madhava
270cbcc16a Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb 2011-01-27 16:00:15 -08:00
Santosh Madhava
73f376cf64 Fix for issue 3370007 Overlay transparency in Java
Change-Id: I68be6f56ad58672a771485a028fc0cd8a0514e8a
2011-01-27 14:03:34 -08:00
Basavapatna Dattaguru
64a2c359ae Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb 2011-01-27 13:54:52 -08:00
Basavapatna Dattaguru
737bd08db0 Fix Issue: 3373525: reduces app. 100mS in create
Updated by removing code duplication

Updated with review comments

Change-Id: I57a596ed09d4d543964059e18a86e143108305ec
2011-01-27 12:24:19 -08:00
Gil Dobjanschi
eea200a96a Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
Change-Id: Ib7cb994e995d934cf896b856da462c9240fcb5f0
2011-01-27 09:51:46 -08:00
Basavapatna Dattaguru
89378fd166 Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 2011-01-26 22:50:59 -08:00