63554 Commits

Author SHA1 Message Date
Andrew Hsieh
1c4c320da7 am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '3347d6597bd6214f037825e41be7e58198d9079d':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:18:59 -07:00
Andrew Hsieh
3347d6597b am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '1f9e749914c7c636bd759da0209e68d5801407ac':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:16:42 -07:00
Andrew Hsieh
1f9e749914 Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
  lib64OpenglRender.so
  lib64EGL_translator.so
  lib64GLES_CM_translator.so
  lib64GLES_V2_translator.so

Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
2012-03-22 09:46:46 -07:00
Joe Fernandez
9eea888105 am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '66f1bafb2326e12814df703a4285373e8651a3ce':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
2012-03-21 16:43:33 -07:00
Joe Fernandez
66f1bafb23 Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 2012-03-21 16:41:19 -07:00
Joe Fernandez
1e72b34f11 docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
2012-03-21 16:25:21 -07:00
The Android Open Source Project
35a8f94da6 Reconcile with ics-mr1-release
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
2012-03-21 08:23:03 -07:00
Jim Miller
df331873c8 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 17:15:22 -07:00
Jim Miller
b7a6f5d7e8 am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen
* commit '928d34704b96db9133e28dc77b716518d335b356':
  Fix 5960562: Show emergency button on PukUnlock screen
2012-03-20 16:41:56 -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
Georg Hofmann
b49e4d63d1 Fixed group and child view caching in SimpleExpandableListAdapter.
Now the adapter reports the correct type count and type for group and child
views by overriding the respective methods from the base class. Each group
view has two types, one for expanded views, one for collapsed views. Each
child view has two types, one for the last view within a group, one for the
other views within a group.

Change-Id: I117b2c0f7e98fb7fe2fdd35c15f7d1f9dc06674f
Signed-off-by: Georg Hofmann <georg.hofmann@gmail.com>
2012-03-19 18:14:49 +01:00
Eric Laurent
165ee4c53d 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:56 -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
9018447a10 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:28:13 -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
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
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
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
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
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
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
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
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
ce06c000b4 Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 2012-03-16 11:53:53 -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
1f60afc5cb docs: Emulator Hardware Acceleration docs for SDK r17
Change-Id: I0714891d14db598f6c4acd29773975bd7754a912
2012-03-16 10:21:32 -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
Keiji Ariyama
d8a3663afc Fixes an issue that occured unexpected exception "pointerIndex out of range".
The findNewActiveIndex method may return -1.
So, the code should check case of -1 before event.getPointerId
and if index0 is -1, gesture should be ended immediately.

Change-Id: I4aae5c84e3db61d10b0bfcfa7bfa6b9115231a52
2012-03-16 21:56:35 +09: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
714d655ccf 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:12 -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
Glenn Kasten
e6aa25bb8e Add empty libmedia_native in old location
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects.  Then those projects will not
need to be updated atomically when libmedia_native is moved.

Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
2012-03-15 15:32:20 -07:00
Dianne Hackborn
4d85c98d83 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:22 -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
150107763d 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:33 -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
da04da21ce am 957f716c: docs: fix toc in search au class
* commit '957f716cf1686145ba4c06ca8669eaa2e22f54e8':
  docs: fix toc in search au class
2012-03-14 16:55:25 -07:00
Dianne Hackborn
6fdab076b7 Remove fade animations from framework drawables.
Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
2012-03-14 16:46:59 -07:00