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

3959 Commits

Author SHA1 Message Date
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
085787a402 am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb 
* commit 'bd633b7297c60771223f0e8799c418cdbce3017c':
  3404665 Preview window is blank after returning from playing exported movie
 2011-01-30 15:13:31 -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
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
f51c35e45f am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb 
* commit '35a1f771759459fc6c9b355d548c5b97cd50e110':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
 2011-01-28 11:53:50 -08:00
Andreas Huber
35a1f77175 am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb 
* commit '79c4648597dab2b7786c8f067896ab66abe190de':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
 2011-01-28 11:51:16 -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
12a8c3959f am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb 
* commit '970436ee42bad03940a73666f8150a28c5789713':
  More robust parsing of NPT time ranges in RTSP.
 2011-01-28 09:43:37 -08:00
Andreas Huber
970436ee42 am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb 
* commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4':
  More robust parsing of NPT time ranges in RTSP.
 2011-01-28 09:41:11 -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
28817de4d7 am 965f22ba: am 3b5d9515: Merge "Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes" into honeycomb 
* commit '965f22ba325ea488034174bf76194470a6f0ee52':
  Fix bug 3395289 Use MODE_IN_COMMUNICATION to evaluate stream vol changes
 2011-01-27 18:18:17 -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
Mike Lockwood
1fce24b241 Add support for synchronous bulk USB transfers 
Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-27 16:22:15 -08:00
Santosh Madhava
05b536e671 am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb 
* commit 'c4f5b712049a5891bc2d1a87031134f3fe0acb03':
  Fix for issue 3370007 Overlay transparency in Java
 2011-01-27 16:04:44 -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
4f54da9629 am b408c3e9: am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb 
* commit 'b408c3e984dbc3af43befc6fd16ff74dd24457a9':
  Fix Issue: 3373525: reduces app. 100mS in create
 2011-01-27 15:12:16 -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
6adcce8a57 am 0966fb9e: am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface 
* commit '0966fb9e73345b1e5ea9464e77beed07378edd6a':
  Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
 2011-01-27 10:36:33 -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
Basavapatna Dattaguru
655c66332e am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 
* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
  Revert "Video editor CTS: Framework modifications"
 2011-01-26 22:54:41 -08:00
Basavapatna Dattaguru
a44f02a4ef am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 
* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
  Revert "Fixes Issue ID: 3396697"
 2011-01-26 22:54:37 -08:00
Basavapatna Dattaguru
90982936a0 am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
  Revert "Video editor CTS: Framework modifications"
 2011-01-26 22:52:38 -08:00
Basavapatna Dattaguru
141a2adb25 am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
  Revert "Fixes Issue ID: 3396697"
 2011-01-26 22:52:31 -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
e9ad1bf4ed am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
  Video editor CTS: Framework modifications
 2011-01-26 21:54:16 -08:00
Basavapatna Dattaguru
497c56f67f am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
  Fixes Issue ID: 3396697
 2011-01-26 21:52:02 -08:00
Basavapatna Dattaguru
a33537c3f1 am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
  Video editor CTS: Framework modifications
 2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
55bf9bdbcb am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '643e8476e1b9da93a06d073797863298ae268393':
  Fixes Issue ID: 3396697
 2011-01-26 21:49:34 -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
James Dong
d4d138a064 am f1e687b6: am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb 
* commit 'f1e687b6e31ba4597558de94c40a73a074ba7703':
  Eliminate duplicated code in export method
 2011-01-26 21:20:16 -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
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
edbf4b3b21 am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb 
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
  This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 19:06:43 -08:00