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

816 Commits

Author SHA1 Message Date
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
Gil Dobjanschi
eea200a96a Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface 
Change-Id: Ib7cb994e995d934cf896b856da462c9240fcb5f0
 2011-01-27 09:51:46 -08:00
James Dong
f1e687b6e3 am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb 
* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
  Eliminate duplicated code in export method
 2011-01-26 21:15:37 -08:00
James Dong
20586a128c Eliminate duplicated code in export method 
bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
 2011-01-26 20:15:49 -08:00
Dharmaray Kundargi
666b9eb3a2 am 45e3d123: Merge "Overlay java files Issue 3370836" into honeycomb 
* commit '45e3d123bce32a8b1f469d366ebb1d3f9ccb2bfc':
  Overlay java files Issue 3370836
 2011-01-26 12:48:32 -08:00
Dharmaray Kundargi
9c077e44c0 Overlay java files Issue 3370836 
Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
 2011-01-26 11:35:29 -08:00
Santosh Madhava
c4132eb299 am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 
* commit '4991a00b28ea17941681396ec5dfc62a53408158':
  Review rework for issue 3385068 : Play gets out of sync
 2011-01-25 22:46:41 -08:00
Santosh Madhava
4991a00b28 Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 22:44:07 -08:00
Santosh Madhava
7196a266c5 am b38ed1af: Merge "Fix for issue 3366265 : Native crash exporting movie" into honeycomb 
* commit 'b38ed1af92c6af03249a50fed0530d20de5cd14d':
  Fix for issue 3366265 : Native crash exporting movie
 2011-01-25 22:21:42 -08:00
Santosh Madhava
1abe0050fa Fix for issue 3366265 : Native crash exporting movie 
Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
 2011-01-25 20:41:55 -08:00
Santosh Madhava
de412d277c Review rework for issue 3385068 : Play gets out of sync 
Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
 2011-01-25 20:22:41 -08:00
Mike Lockwood
7fadb5e77f am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 
* commit '2b3da7ab61ac920881f35bbf66234c073d79ba24':
  MTP: Fix race conditions in MtpServer JNI code
 2011-01-25 15:45:48 -08:00
Mike Lockwood
2b3da7ab61 Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 2011-01-25 15:44:28 -08:00
Mike Lockwood
071b2b6739 MTP: Fix race conditions in MtpServer JNI code 
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.

BUG: 3317803

Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-25 15:10:31 -08:00
Santosh Madhava
d645172123 am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 
* commit '1c9ac91634f7663b7a199f6eacc5a363f888e4d4':
  Fix for issue 3385068 : Play gets out of sync
 2011-01-25 14:48:28 -08:00
Santosh Madhava
1c9ac91634 Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 14:46:15 -08:00
Jaikumar Ganesh
e4d494b495 am 5cbb1622: Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 
* commit '5cbb162262cf2dc1a5763ddbdeb4f8ec50c33dba':
  Rename virtual call API to ScoUsingVirtualCall.
 2011-01-25 14:00:32 -08:00
Jaikumar Ganesh
5cbb162262 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Jaikumar Ganesh
dde68c64fd Rename virtual call API to ScoUsingVirtualCall. 
This API makes more sense with regard to headset profile.
Bug: 3381532

Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
 2011-01-25 13:49:35 -08:00
Santosh Madhava
a6714ce2bb Fix for issue 3385068 : Play gets out of sync 
Change-Id: Iaf5e2f246b9cbfc5c8093d34ed085fe255ae500b
 2011-01-25 13:15:43 -08:00
Brad Fitzpatrick
28ae70ceac am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder" 
* commit '23a813e17d94083c24a34559864722c809b4e0f7':
  Avoid using String.format in MediaRecorder
 2011-01-25 10:48:05 -08:00
Dheeraj Sharma
1ac760afab Issue no : 3370622 
VideoEditor: Fix for Clear Surface API

Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
 2011-01-24 22:52:40 -08:00
Santosh Madhava
9c0bd864a3 Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb 2011-01-24 22:33:44 -08:00