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

64157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
f9737a890b am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit 'dbab18f64a1b17311a0c865ed43200e9dc239113':
  docs: Android SDK r17 (RC6) Release Notes
 2012-03-19 08:27:59 -07:00
Joe Fernandez
dbab18f64a Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 2012-03-19 08:25:48 -07:00
Justin Ho
68f4ffb435 am 47ec443a: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit '47ec443ae0cab1de6f1e2504974cc42e019ce556':
 2012-03-19 08:15:35 -07:00
Justin Ho
8659e458d0 am 46a41ced: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit '46a41ced325f0519e37374179623ff3079b6aed9':
  DO NOT MERGE Revert "Increase line limit for summary text"
 2012-03-19 08:14:21 -07:00
Justin Ho
46a41ced32 am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit '972d12aa1e6fba69094c0a9270df645b7db74f3a':
  DO NOT MERGE Revert "Increase line limit for summary text"
 2012-03-19 08:11:16 -07:00
Justin Ho
47ec443ae0 am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit '972d12aa1e6fba69094c0a9270df645b7db74f3a':
  DO NOT MERGE Revert "Increase line limit for summary text"
 2012-03-19 08:11:15 -07:00
Justin Ho
972d12aa1e Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 2012-03-19 08:08:56 -07:00
Justin Ho
e36f86bce1 DO NOT MERGE Revert "Increase line limit for summary text" 
This reverts commit 90e3bcae6771df767c3377ca3bd6c08d99062ca3
 2012-03-17 17:09:35 -07:00
Eric Laurent
10c3fc89a4 audioflinger: fix issue with camcorder and A2DP 
Some audio HALs do not support well a device selection of 0 (no device)
received on an input stream.

This can happen because of a problem in the audioflinger code that handles
the forwarding of the output device selection to the record thread for use by
the pre processing modules that need it. If the output device is 0 (meaning
no op, which happens when stopping playback over A2DP) audioflinger could not
detect it was an output device selection and would forward it to the input
stream (see AudioFlinger::setParameters() and RecordThread::checkForNewParameters_l().

Issue 6179641.

Change-Id: Idae534521866538e0d12ba259a2834f402a922e2
 2012-03-16 20:37:59 -07:00
The Android Automerger
44857eeb0f merge in ics-mr1-release history after reset to ics-mr1 2012-03-16 19:32:33 -07:00
Joe Fernandez
dad557e0cf docs: Android SDK r17 (RC6) Release Notes 
Change-Id: I1e58b3827e4fe70310d2154e0f85b16b79d6a0d2
 2012-03-16 17:45:20 -07:00
Eric Laurent
044e7503cc am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit 'eaa08d35154b0b9d62098c80c75f2deeadf72b9e':
 2012-03-16 17:29:43 -07:00
Eric Laurent
ec94ecadb7 am b1853f70: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit 'b1853f706371b5050cd8184f5c33955c2f5ae36a':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 17:27:09 -07:00
Eric Laurent
eaa08d3515 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 17:26:24 -07:00
Eric Laurent
eb99caccd7 am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp 
* commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':
 2012-03-16 17:26:15 -07:00
Eric Laurent
0435339072 resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp 
Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
 2012-03-16 17:22:34 -07:00
Eric Laurent
b388138ff2 resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp 
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
 2012-03-16 17:19:25 -07:00
Eric Laurent
b1853f7063 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 15:01:03 -07:00
Eric Laurent
393dd03eaf am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 
* commit '3fe7ee651db0aae9485ead227c89db1e24b9e245':
  AudioTrack: relax check on minimum buffer size
 2012-03-16 15:01:01 -07:00
Eric Laurent
2a0d685ed6 Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 2012-03-16 14:58:21 -07:00
Eric Laurent
3fe7ee651d Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 2012-03-16 14:58:07 -07:00
Amith Yamasani
634db5823f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-16 14:17:09 -07:00
Amith Yamasani
65e4b90d6c am 31f7ef24: am 90e3bcae: Increase line limit for summary text 
* commit '31f7ef2436ca7cbe754f33d536593f9640a31fb0':
  Increase line limit for summary text
 2012-03-16 14:17:05 -07:00
Amith Yamasani
579922e331 am 5fd6deb0: am 90e3bcae: Increase line limit for summary text 
* commit '5fd6deb0497d6763514f125b5fde69ee4efdc3c2':
  Increase line limit for summary text
 2012-03-16 14:16:27 -07:00
Amith Yamasani
31f7ef2436 am 90e3bcae: Increase line limit for summary text 
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
 2012-03-16 14:13:48 -07:00
Amith Yamasani
5fd6deb049 am 90e3bcae: Increase line limit for summary text 
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
 2012-03-16 14:13:45 -07:00
Amith Yamasani
90e3bcae67 Increase line limit for summary text 
Doing this to accomodate some really long warning text in a
checkbox widget. Needs 5 lines for English. Probably a lot
more for German, etc., so increasing it to 10 lines.

Please don't abuse that. 4 lines is still a reasonable max.

Change-Id: Ife5858f2165cb2bc046ce606f29d31010d26ecc2
 2012-03-16 13:13:50 -07:00
Eric Laurent
dc63f3fe40 MediaPlayerService: fix AudioSink latency 
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.

This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.

Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4

Conflicts:

	media/libmediaplayerservice/MediaPlayerService.cpp
 2012-03-16 12:25:31 -07:00
Eric Laurent
0df689495a AudioTrack: relax check on minimum buffer size 
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.

Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.

Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f

Conflicts:

	media/libmedia/AudioTrack.cpp
 2012-03-16 12:22:07 -07:00
Katie McCormick
f518e0e82b am 2f8b35dd: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2f8b35dd88501d9174565f7f377933b0e516032c':
 2012-03-16 12:15:26 -07:00
Katie McCormick
86d5301b0d am 45660f46: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '45660f46d3877cc146ae52b9c152dc606d622485':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:13:03 -07:00
Katie McCormick
2f8b35dd88 am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2b056c6e6759d63045c22556c5418a08fcb3f80c':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:11:30 -07:00
Katie McCormick
45660f46d3 am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2b056c6e6759d63045c22556c5418a08fcb3f80c':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:11:16 -07:00
Katie McCormick
2b056c6e67 Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 2012-03-16 12:09:59 -07:00
Dianne Hackborn
8b28ebd5f2 am df3228e5: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'df3228e561636832436d45911befa0798ad50594':
 2012-03-16 11:58:23 -07:00
Dianne Hackborn
354e034697 am c032a73b: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'c032a73b511d4006e083a646b7dd23d54ed373ac':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:57:45 -07:00
Katie McCormick
4099e17228 Doc update: DDMS Network Traffic tool. 
Change-Id: I9aa0d94e9bdc20681ec7be3f98233223c0e742d8
 2012-03-16 11:55:55 -07:00
Dianne Hackborn
c032a73b51 am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:55:05 -07:00
Dianne Hackborn
df3228e561 am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:55:00 -07:00
Dianne Hackborn
ce06c000b4 Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 2012-03-16 11:53:53 -07:00
Joe Fernandez
14a5c93d18 am 6b163632: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit '6b16363232e107047f430614b4a81e61b7f391c1':
 2012-03-16 10:48:33 -07:00
Joe Fernandez
d90576c91e am c8e83aa7: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit 'c8e83aa73e174be163649bb80989b9099fbb74cf':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:47:38 -07:00
Joe Fernandez
c8e83aa73e am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit '1f60afc5cbec849054c1787bf3141d6d0d49e4c3':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:44:54 -07:00
Joe Fernandez
6b16363232 am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit '1f60afc5cbec849054c1787bf3141d6d0d49e4c3':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:44:50 -07:00
Joe Fernandez
1f60afc5cb docs: Emulator Hardware Acceleration docs for SDK r17 
Change-Id: I0714891d14db598f6c4acd29773975bd7754a912
 2012-03-16 10:21:32 -07:00
Glenn Kasten
97824b706d am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit 'aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
  Add empty libmedia_native in old location
 2012-03-16 10:03:54 -07:00
Glenn Kasten
aa1bd6dec6 am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit 'd8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
  Add empty libmedia_native in old location
 2012-03-16 10:01:28 -07:00
Glenn Kasten
d8cc14211a am 42c6d163: Merge "Add empty libmedia_native in old location" 
* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
  Add empty libmedia_native in old location
 2012-03-15 22:09:38 -07:00
Glenn Kasten
42c6d163aa Merge "Add empty libmedia_native in old location" 2012-03-15 16:02:46 -07:00
Scott Main
66c36b886d am 886603da: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '886603da73526eb992dfb4bc5afc89c7a17294d8':
 2012-03-15 16:00:40 -07:00