73488 Commits

Author SHA1 Message Date
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
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
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
Glenn Kasten
f6b8f7b34f Merge "audio_channel_in/out_mask_from_count" 2012-03-19 07:31:58 -07:00
Wu-cheng Li
c59d1a8f0c Do not set camera preview display if the surface is null.
MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.

bug:5988937

Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
2012-03-19 13:54:15 +08:00
Marc Blank
b106153ba9 Merge "Use renameTo safely when creating the user 0 account database" 2012-03-18 21:37:52 -07:00
Marc Blank
c6b0f99bb3 Use renameTo safely when creating the user 0 account database
* Because the user directory probably won't exist, the renameTo
  in previous code fails silently

Bug: 6188815
Change-Id: I6afd1bad9bbd1a36de7e93d9e02ed7172b1ed370
2012-03-18 19:18:49 -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
Jeff Brown
c0f7366a15 aapt: Preprocess images in parallel.
Currently hardcoded to use up to 4 threads.

This change substantially reduces the amount of time spent
preprocessing framework resources to just a few seconds.

Change-Id: I02fdd283fb529a152aeb22ac87f278779fd77983
2012-03-17 14:12:57 -07:00
Jeff Brown
c9fd9263fe Use quicksort to sort the string pool.
The current implementation of Vector::sort uses insertion sort
on the assumption that the data is mostly sorted.  It isn't.

This change brings the total time spent sorting packages by config
down to 500ms from about 93 seconds.

Bug: 6186278
Change-Id: Iec8da11e09297acd6c73733d063b0fa9dacf69f7
2012-03-16 22:25:15 -07:00
Jeff Brown
61361f376b Add some comments about StringPool sort order.
Change-Id: I57f24d46328a6bfef883819eaf95c03114d573bb
2012-03-16 22:24:54 -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
John Reck
3869fa2294 Include MotionEvent on ACTION_MOVE's TouchEventData
Change-Id: Iaf2aa284d0e794d0d9fa430b7c0da2aedd196ce1
2012-03-16 19:20:00 -07:00
Jeff Brown
bf02b98473 Merge "Remove dead code in StringPool." 2012-03-16 19:10:57 -07:00
Jeff Brown
4eb7fbb250 Merge "Make StringPool entry types trivially movable." 2012-03-16 19:10:47 -07:00
Dianne Hackborn
dea50f05e4 Merge "More work on rotation animation." 2012-03-16 18:29:16 -07:00
Jeff Sharkey
06ba42d5fb Merge "Move StrictMode timers to postAtFrontOfQueue()." 2012-03-16 18:26:48 -07:00
Dianne Hackborn
d6b32b6178 More work on rotation animation.
Change-Id: Ib8206db98b68cb1e0b16e4c55d949e80ff31bd9f
2012-03-16 18:20:07 -07:00
Chet Haase
d3c326e653 Merge "Reduce redundant animation processing" 2012-03-16 18:03:21 -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
Xavier Ducrohet
2f14aa169f Merge "LayoutLib: Properly support attr ns when used in styles." 2012-03-16 16:46:00 -07:00
Chet Haase
c6ffab3241 Reduce redundant animation processing
Starting several animations will place separate events onto the
animation queue, which may cause the active animations to get
processed more than once in any frame when one of those start messages
is processed.

This change moves the logic of starting pending animations into
the animation frame processing itself. Now when a start event is
processed, it only calls the animation frame logic if there are
unstarted animations pending.

Issue #6172602 Inconsistent animation callbacks

Change-Id: I3a546f0c849f42b2dd998f099fcdfafd7d780ad9
2012-03-16 16:43:06 -07:00
Jeff Sharkey
3761f33387 Move StrictMode timers to postAtFrontOfQueue().
StrictMode posts a message to estimate how long the main thread was
blocked during a violation.  Currently, any pending messages are
counted against the violation.  To avoid this, switch to using
postAtFrontOfQueue().

Bug: 6119289
Change-Id: I94530632ca678b78b75a698cf9193641b102be9a
2012-03-16 15:46:46 -07:00
Craig Mautner
d87eb6c7c6 Merge "Fix black screen on app transition." 2012-03-16 15:35:21 -07:00
George Mount
9e4fdfae11 Merge "Move the selection handles vertically to match TextView." 2012-03-16 15:31:50 -07:00
Craig Mautner
0059d3508f Fix black screen on app transition.
The layer adjustment to an animating window upon completion was masking
the window behind the mWindowAnimationBackgroundSurface, a DimSurface.
The DimSurface was not being hidden because the step was happening too
late. Swapping the order of performAnimationsLocked and
updateWindowsAppsAndRotationAnimationsLocked fixes this ordering issue.

Fixes bug 6185920.

Change-Id: I0ff64c019e821fa3a92505ac6351f2648897e592
2012-03-16 15:26:01 -07:00
Jeff Brown
345b7eb874 Remove dead code in StringPool.
The sorted string pool option was no longer used.
Neither were strings with associated identifiers.

Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603
2012-03-16 15:25:17 -07:00
Jeff Brown
8a9cfcc852 Make StringPool entry types trivially movable.
Change-Id: If93957a840a0f1cae2e6ef291eeeb1b0c7c20958
2012-03-16 15:24:32 -07:00
Dianne Hackborn
baad5d5f0d Merge "resolved conflicts for merge of 354e0346 to master" 2012-03-16 15:19:51 -07:00
Andreas Huber
b070521ee1 Merge "Report an error instead of waiting for EOS indefinitely in sf2." 2012-03-16 15:19:30 -07:00
Xavier Ducrohet
5d701eddcf LayoutLib: Properly support attr ns when used in styles.
Change-Id: I885864588928589d7c9a34b94339917c5be47fa5
2012-03-16 15:14:02 -07:00
George Mount
f5124e39b8 Move the selection handles vertically to match TextView.
Bug 6185758

Change-Id: I4165f216b5e02cab5b19f10666f28abbb956de03
2012-03-16 15:13:24 -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
Dianne Hackborn
29ba7e6680 resolved conflicts for merge of 354e0346 to master
Change-Id: I432f5f43aa1e19c6a474e8656fe0e3715828e8af
2012-03-16 15:03:36 -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
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