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

65814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
179239bc6c am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP
 2012-03-19 08:34:03 -07:00
Eric Laurent
14958e21c1 Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 2012-03-19 08:32:35 -07:00
Joe Fernandez
9b815629a3 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:31 -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
f31099f5d6 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:33 -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
Joe Fernandez
dad557e0cf docs: Android SDK r17 (RC6) Release Notes 
Change-Id: I1e58b3827e4fe70310d2154e0f85b16b79d6a0d2
 2012-03-16 17:45:20 -07:00
Eric Laurent
c182e36c8c am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 15:01:44 -07:00
Eric Laurent
0615baffd3 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:42 -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
8e34dc9312 am 90e3bcae: Increase line limit for summary text 
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
 2012-03-16 14:14:05 -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
8140f3f4f1 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:31 -07:00
Katie McCormick
2b056c6e67 Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 2012-03-16 12:09:59 -07:00
Katie McCormick
4099e17228 Doc update: DDMS Network Traffic tool. 
Change-Id: I9aa0d94e9bdc20681ec7be3f98233223c0e742d8
 2012-03-16 11:55:55 -07:00
Dianne Hackborn
5da418d331 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:48 -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
a1faacd268 am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit '1f60afc5cbec849054c1787bf3141d6d0d49e4c3':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:43:58 -07:00
Joe Fernandez
1f60afc5cb docs: Emulator Hardware Acceleration docs for SDK r17 
Change-Id: I0714891d14db598f6c4acd29773975bd7754a912
 2012-03-16 10:21:32 -07:00
Scott Main
04144b4b38 am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:56:03 -07:00
Scott Main
eb1d42e4fa Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 2012-03-15 15:52:56 -07:00
Dianne Hackborn
2a29b3ad13 Debugging code for #6169553: Make Phone launch faster 
The activity manager now has a tick when launching an app every
500ms, where it collects the current stack traces of the app if
it hasn't finished launching.  These traces are included as part
of dumpstate.

This is only done on non-user builds.

Change-Id: I7f09ea00aab821ac81795f48c9d68fcca65f89fe
 2012-03-15 15:48:38 -07:00
Eric Fischer
3fc7a20efc Merge "Import translations. DO NOT MERGE" into ics-aah 2012-03-15 13:47:27 -07:00
Eric Fischer
ee99a333c8 Import translations. DO NOT MERGE 
Change-Id: Ibf2f1c11aeb2a67003a8912d921d05bc761c1e6a
 2012-03-15 13:26:36 -07:00
Dianne Hackborn
8b5944b75b am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1 
* commit '33ace979a452301796694ffd64506f082de42f0d':
  Remove fade animations from framework drawables.
 2012-03-15 11:29:24 -07:00
Dianne Hackborn
33ace979a4 Merge "Remove fade animations from framework drawables." into ics-mr1 2012-03-15 11:27:43 -07:00
Scott Main
9c7adc37fd am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1 
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
  docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
 2012-03-15 10:22:45 -07:00
Scott Main
f32ab91414 Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1 2012-03-15 10:21:00 -07:00
Robert Ly
cce995d72d am 957f716c: docs: fix toc in search au class 
* commit '957f716cf1686145ba4c06ca8669eaa2e22f54e8':
  docs: fix toc in search au class
 2012-03-14 16:55:19 -07:00
Dianne Hackborn
6fdab076b7 Remove fade animations from framework drawables. 
Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
 2012-03-14 16:46:59 -07:00
Robert Ly
957f716cf1 docs: fix toc in search au class 
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
 2012-03-14 16:24:25 -07:00
Scott Main
1657080a0c docs: update various SDK and AVD Manager screenshots 
and remove one from the licensing doc that's not necessary

Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
 2012-03-14 16:16:18 -07:00
Robert Ly
badd0a1a34 am b285125d: Merge "docs: android u search class" into ics-mr1 
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
  docs: android u search class
 2012-03-14 15:46:05 -07:00
Robert Ly
b285125d4b Merge "docs: android u search class" into ics-mr1 2012-03-14 15:41:02 -07:00
Scott Main
a5ccec20a6 am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1 
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
  docs: remove link from GP logo
 2012-03-13 23:12:36 -07:00
Scott Main
7f94977867 Merge "docs: remove link from GP logo" into ics-mr1 2012-03-13 23:09:09 -07:00
Robert Ly
055e3f25ba docs: android u search class 
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
 2012-03-13 18:14:02 -07:00
Eric Fischer
c65c445976 Import translations. DO NOT MERGE 
Change-Id: I100cc30d4d8d7912f99b99a9833ec9d927360931
 2012-03-13 13:52:30 -07:00
Daniel Lehmann
3982af7b9c am 0e873700: Remove the country detector logging 
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
  Remove the country detector logging
 2012-03-12 18:25:02 -07:00
Daniel Lehmann
0e87370077 Remove the country detector logging 
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
 2012-03-12 17:04:17 -07:00
Justin Mattson
4ad90984e7 Merge "Add information to CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into ics-aah 2012-03-12 16:34:24 -07:00
Justin Mattson
74803dc592 Add information to CONFIGURED_NETWORKS_CHANGED_ACTION broadcast 
This will allow listeners to better determine what configuration
change occurred.

Bug: 6133917

Change-Id: Ib53949713c4574036313c3b0f69e1ecf3350cae4
 2012-03-12 16:33:01 -07:00
Wink Saville
a1c97c65de am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed. 
* commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4':
  Allow CDMA on LTE devices to get data connections even if otasp is needed.
 2012-03-12 15:54:07 -07:00
Eric Fischer
b944500710 Import translations. DO NOT MERGE 
Change-Id: I321910cd4d58216f0258fd66048b2ceb56a235db
 2012-03-12 13:35:01 -07:00
Wink Saville
f4ae6aabbc Allow CDMA on LTE devices to get data connections even if otasp is needed. 
Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.

Bug: 6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
 2012-03-10 13:23:35 -08:00