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

838 Commits

Author SHA1 Message Date
Dharmaray Kundargi
284f3128fa am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb 
* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
  Fix issue 3426489 Overlay background changed when exported
 2011-02-04 19:11:55 -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
73edcfe8f4 am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 
* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
 2011-02-04 17:03:47 -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
Eric Laurent
5f3e9e69a1 am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb 
* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection
 2011-02-04 16:33:43 -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
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
bdb23c2675 am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb 
* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
  Fix issues 3425035 and 3423785.
 2011-02-04 14:08:25 -08:00
Eric Laurent
2e96f15d8c Merge "Fix issues 3425035 and 3423785." into honeycomb 2011-02-04 14:06:40 -08:00
Danny Fernandes
1734e8350f am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb 
* commit '5e1f3e4112f77bdb99bfef8c3ba185f0cb89e5ef':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level
 2011-02-04 13:39:50 -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
Gil Dobjanschi
99ec3e7f27 am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb 
* commit '7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
  Bug fix: 3421011 ANR during delete video clip
 2011-02-03 17:45:33 -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
6f1bd261b7 am 9c0a1003: Merge "Fix issue 3371080" into honeycomb 
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080
 2011-02-03 10:28:24 -08:00
Eric Laurent
9c0a1003bd Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00
Dheeraj Sharma
d13f987f73 am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb 
* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
  Fix for issue :  3419353 Crash during transition generation
 2011-02-03 09:38:43 -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
3f9a851e07 am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb 
* commit 'ed2c513337ae7581ef73b88424da91ef2d862a78':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
 2011-02-02 22:06:33 -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
3d3621f08b am 54b0a7f3: Merge "Fix issue 3412777 ANR on adding effects." into honeycomb 
* commit '54b0a7f3ff0411a215e7e23f1041d414a32147b5':
  Fix issue 3412777 ANR on adding effects.
 2011-02-02 15:52:05 -08:00
Dharmaray Kundargi
a3f87f855b Fix issue 3412777 ANR on adding effects. 
Change-Id: Id3c480a8261423412a99375f71cf6ee585b6c22b
 2011-02-02 13:09:08 -08:00
Nemmara Venkateswaran
e00d44ced2 am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb 
* commit '47b8c96b253ab24d0df089c87ce0798d4981400a':
  Fix for issue 3370023 : Wrong aspect ratio in overlay
 2011-02-02 09:29:13 -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
Dheeraj Sharma
dacacb50ed am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb 
* commit '22ad6243d7c9081e4f1a13097cfa4638cf42c3fe':
  Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
 2011-02-01 09:02:36 -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
537cc3b19d am ba2ee617: Merge "Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged" into honeycomb 
* commit 'ba2ee6178ec386e838434cef902fb7de34ec6585':
  Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
 2011-01-31 22:09:24 -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
8ceccbed71 am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb 
* commit '327549f9961b8cd562d1a92c1455005672aa2b95':
  Fix issue 3408285. Fix issue in Thread safe in Java.
 2011-01-31 19:03:36 -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
Gil Dobjanschi
1aa865aae0 am 2bb13573: Bug fix: 3405930 Crash editing overlay text 
* commit '2bb13573d619e3371d06847d36db78a20b17dfab':
  Bug fix: 3405930 Crash editing overlay text
 2011-01-31 04:13:06 -08:00
Gil Dobjanschi
2bb13573d6 Bug fix: 3405930 Crash editing overlay text 
Change-Id: Icd304ef8dde2b41812b14857dc3c112cc22d578e
 2011-01-31 03:57:15 -08:00
Dharmaray Kundargi
75aa290d5d am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit 'ff8432548eb96655190486ee0f0fa08de5451e66':
  Merging the same files on top of tree.
 2011-01-30 16:35:03 -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
471ebbca5f am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '45911e1969fd1843bac5806e06f351123b67f596':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:22:39 -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
bd633b7297 am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit '167e7488af4d53673ff2fcc0723ae2a1584f5194':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:10:25 -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
Jean-Michel Trivi
965f22ba32 am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb 
* commit '3b5d9515f208d28ae168c3f3d3cd442ff6e6e45a':
  Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
 2011-01-27 18:15:39 -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
c4f5b71204 am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb 
* commit '270cbcc16a72f982d84afeb5e3fd3f166936394a':
  Fix for issue 3370007 Overlay transparency in Java
 2011-01-27 16:02:59 -08:00
Santosh Madhava
270cbcc16a Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb 2011-01-27 16:00:15 -08:00
Basavapatna Dattaguru
b408c3e984 am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb 
* commit '64a2c359aeda59e4bc43d48f31ade919e918ea26':
  Fix Issue: 3373525: reduces app. 100mS in create
 2011-01-27 15:03:36 -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
0966fb9e73 am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface 
* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5':
  Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
 2011-01-27 10:34:39 -08:00