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

65874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
82145416b3 Import translations. DO NOT MERGE 
Change-Id: I6dbfdf8644ae3be5b23a28674e243e5b7d02eddc
 2012-03-21 12:29:38 -07:00
Jim Miller
0f97e69491 am 5490256b: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '5490256b53cad3147f652fe163d35ca404800068':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:44:06 -07:00
Jim Miller
5490256b53 am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen 
* commit '928d34704b96db9133e28dc77b716518d335b356':
  Fix 5960562: Show emergency button on PukUnlock screen
 2012-03-20 16:42:24 -07:00
Jim Miller
928d34704b Fix 5960562: Show emergency button on PukUnlock screen 
This fixes an issue where the device doesn't show the emergency button
on the SIM PUK unlock screen. The problem was introduced in I3127bfd5
where we allowed the button to be conditionally shown.

Change-Id: I3e2aae2bce89399a2564c3f8a726a8db99cdec86
 2012-03-20 15:30:43 -07:00
Eric Fischer
fb73194fb7 Import translations. DO NOT MERGE 
Change-Id: I3bfedda6fef28cc3004e3ec16a968a3fe7c40dbf
 2012-03-20 11:51:23 -07:00
Eric Fischer
dcf2ef3a6c am 23ebe728: (-s ours) Import translations. DO NOT MERGE 
* commit '23ebe7285c5f7586b136eb387aa095500f0d2c11':
  Import translations. DO NOT MERGE
 2012-03-19 14:00:00 -07:00
Eric Fischer
63aa35baf0 Import translations. DO NOT MERGE 
Change-Id: I38403c103e6083bfb0e51404752ac7b3f7b9819a
 2012-03-19 13:43:31 -07:00
Eric Fischer
23ebe7285c Import translations. DO NOT MERGE 
Change-Id: Id9db76785997b8b9e30b96d86e6cb72ae56130fb
 2012-03-19 13:41:32 -07:00
Eric Laurent
b8e228adfc am 179239bc: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 
* commit '179239bc6c2c7d09f226c6771735169d2bce98cd':
  audioflinger: fix issue with camcorder and A2DP
 2012-03-19 08:36:45 -07:00
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
d95e188d3f am 9b815629: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1 
* commit '9b815629a3e989511ce4875880483ff9eed8b63e':
  docs: Android SDK r17 (RC6) Release Notes
 2012-03-19 08:30:18 -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
184945d18b am f31099f5: (-s ours) am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1 
* commit 'f31099f5d69e554b85a723f81667dd29da797555':
  DO NOT MERGE Revert "Increase line limit for summary text"
 2012-03-19 08:14:30 -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
49f5f4ab5c am c182e36c: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit 'c182e36c8c70a7d25965aa2d0c7ed458900f3159':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 15:04:06 -07:00
Eric Laurent
cd349e8067 am 0615baff: am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 
* commit '0615baffd3a1ef42cbf58058cef1d84f8d3c2f29':
  AudioTrack: relax check on minimum buffer size
 2012-03-16 15:04:04 -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
e57de5838a am 8e34dc93: am 90e3bcae: Increase line limit for summary text 
* commit '8e34dc93123dc4e4fd5cd5b0fd92ae551a905615':
  Increase line limit for summary text
 2012-03-16 14:16:45 -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
7a2cfddcba am 8140f3f4: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '8140f3f4f1ddeb1fab6904c2fc6f44bafaaf5177':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:14:18 -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
Dianne Hackborn
1fec6aaf73 am 5da418d3: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit '5da418d3319add35f15197db39195984b0262e84':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:57:53 -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
b590afdb8a am a1faacd2: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit 'a1faacd268b431f73c07be7db5e1b7388f6655c1':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:46:37 -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
9d9a08c07b am 04144b4b: am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1 
* commit '04144b4b38bdab608d663fe7419a7c293bf36081':
  docs: Fix a bunch of misc doc issues from external tracker
 2012-03-15 15:59:19 -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
80a54c5005 am 3fc7a20e: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-aah 
* commit '3fc7a20efcde6d2936f6f6efeba6661a38144f9c':
  Import translations. DO NOT MERGE
 2012-03-15 13:49:07 -07:00
Eric Fischer
dfc4ce3c4e Merge "Import translations. DO NOT MERGE" into ics-aah-exp 2012-03-15 13:47:36 -07:00
Eric Fischer
3fc7a20efc Merge "Import translations. DO NOT MERGE" into ics-aah 2012-03-15 13:47:27 -07:00
Eric Fischer
713eb6b4c8 Import translations. DO NOT MERGE 
Change-Id: I2995069e595d94cb90738e57e29de7d49b193846
 2012-03-15 13:28:31 -07:00
Eric Fischer
ee99a333c8 Import translations. DO NOT MERGE 
Change-Id: Ibf2f1c11aeb2a67003a8912d921d05bc761c1e6a
 2012-03-15 13:26:36 -07:00