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

3836 Commits

Author SHA1 Message Date
Dheeraj Sharma
9cd6a8e2cf am dacacb50: am 22ad6243: Merge "Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project" into honeycomb 
* commit 'dacacb50ed616bc52c092d9716252ec49a94457d':
  Fix for issue 3410895 Transition regeneration not happening after changing aspect ratio of project
 2011-02-01 13:26:51 -08:00
Dheeraj Sharma
b5f497b404 am 537cc3b1: 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 '537cc3b19d84e5b0c8d3631c051bb36a4c8cf784':
  Fix for issue 3409874:Crash during addition of pan and zoom effect if start and end rect are unchanged
 2011-02-01 13:25:05 -08:00
Dharmaray Kundargi
4fd9eaf5a9 am 8ceccbed: am 327549f9: Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb 
* commit '8ceccbed7177234f219f2aa39f71554f9141d084':
  Fix issue 3408285. Fix issue in Thread safe in Java.
 2011-02-01 13:23:43 -08:00
Gloria Wang
944170f2cf Merge "- Support comfort noise in AMRExtractor - Support duration and seeking in AMRExtractor for different bit rates" 2011-02-01 10:35:10 -08:00
Gloria Wang
069715b6f8 - Support comfort noise in AMRExtractor 
- Support duration and seeking in AMRExtractor for different bit rates

Bug 2530101

Change-Id: I12beffea73cea0ec056f0e0cf51a4a8d46d897b8
 2011-02-01 10:05:59 -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
327549f996 Merge "Fix issue 3408285. Fix issue in Thread safe in Java." into honeycomb 2011-01-31 19:01:13 -08:00
Andreas Huber
0026394ed9 am b450d96b: am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb 
* commit 'b450d96b3d13cd341ef7aa4483c2223ddfecce3c':
  Disconnect HTTP live sessions as soon as the request comes in.
 2011-01-31 18:38:07 -08:00
Andreas Huber
b450d96b3d am 537fa17f: Merge "Disconnect HTTP live sessions as soon as the request comes in." into honeycomb 
* commit '537fa17f21390fcb4a8d4b24f1cc80ca147ccce0':
  Disconnect HTTP live sessions as soon as the request comes in.
 2011-01-31 18:31:05 -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
Mike Lockwood
4639532261 MTP: Use ro.product.manufacturer system property value for MTP manufacturer name 
Previously it was hard coded to "Google, Inc."

BUG: 3405965

Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-31 17:11:24 -05:00
Gil Dobjanschi
0458159852 am 1aa865aa: am 2bb13573: Bug fix: 3405930 Crash editing overlay text 
* commit '1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
  Bug fix: 3405930 Crash editing overlay text
 2011-01-31 04:16:16 -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
Dheeraj Sharma
3a70cf3aff am 60a3ead5: am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 
* commit '60a3ead52ec6216b28d1d82ab3480a08bf919c17':
  Fix for issue 3404671 Crash when exporting movie in JNI
 2011-01-30 18:18:43 -08:00
Dheeraj Sharma
60a3ead52e am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb 
* commit 'cd73d1ed6d1149a2ae642e87ffe8d89100fbafec':
  Fix for issue 3404671 Crash when exporting movie in JNI
 2011-01-30 18:14:40 -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
8e6c69b092 am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb 
* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
  Merging the same files on top of tree.
 2011-01-30 16:37:41 -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
407a558af5 am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb 
* commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
  Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
 2011-01-30 15:25:07 -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
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