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

3670 Commits

Author SHA1 Message Date
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
Basavapatna Dattaguru
3b728ca70a Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 2011-01-26 22:50:50 -08:00
Basavapatna Dattaguru
d36b1f0739 Revert "Video editor CTS: Framework modifications" 
This reverts commit eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7.
 2011-01-26 22:38:47 -08:00
Basavapatna Dattaguru
4b9969af57 Revert "Fixes Issue ID: 3396697" 
This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.
 2011-01-26 22:36:10 -08:00
Basavapatna Dattaguru
9af5da5258 Merge "Video editor CTS: Framework modifications" into honeycomb 2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
643e8476e1 Merge "Fixes Issue ID: 3396697" into honeycomb 2011-01-26 21:47:40 -08:00
Basavapatna Dattaguru
eb6d6ecf4b Video editor CTS: Framework modifications 
Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899
 2011-01-26 20:58:56 -08:00
Basavapatna Dattaguru
8b9ba61644 Fixes Issue ID: 3396697 
Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe
 2011-01-26 20:31:11 -08:00
James Dong
20586a128c Eliminate duplicated code in export method 
bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
 2011-01-26 20:15:49 -08:00
Andreas Huber
63b38e31aa Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb 2011-01-26 15:50:04 -08:00
Andreas Huber
0f535afd7e This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
And now we're just ignoring them. Yay standards.

Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35
related-to-bug: 3353752
 2011-01-26 15:40:56 -08:00
Mike Lockwood
a13732e17a Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb 2011-01-26 15:30:07 -08:00
Mike Lockwood
2107d23fc9 MTP: Fix month off by one error in date parsing and formatting code 
BUG: 3379100

Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-26 15:11:48 -08:00
James Dong
7fb232c40c Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb 2011-01-26 14:43:59 -08:00
Dharmaray Kundargi
45e3d123bc Merge "Overlay java files Issue 3370836" into honeycomb 2011-01-26 12:46:23 -08:00
Dharmaray Kundargi
ecebf173de Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb 2011-01-26 12:46:20 -08:00
James Dong
5f3ab06e90 Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source. 
This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where
 o n is the actual number of buffers advertised by the video encoder
 o time_interval is the interval settings for timelapse video recording
   specifying the time distance between neighboring input video frames

The fix includes two parts:
o OMXCodec will not submit all n buffers at one time, but instead submit one input
  frame at one time if it become available.

o Timelapse camera source made available the first two input frames and do not skip
  them so that the first compressed output frame data can be received regardless
  the specified time_interval

bug - 3367659

Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
 2011-01-26 12:11:22 -08:00
Andreas Huber
373d357a8b Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb 2011-01-26 12:08:09 -08:00