7 years agopandaboard: add initial support for panda with lvds p-froyo-exp
David Anders [Tue, 19 Oct 2010 19:46:11 +0000 (14:46 -0500)]
pandaboard: add initial support for panda with lvds

8 years agoAdd support for Flash 10.1 for h264 support master p-froyo
a0876447 [Mon, 20 Sep 2010 12:39:42 +0000 (18:09 +0530)]
Add support for Flash 10.1 for h264 support

Added the flash support for aac and 1D h264 buffer

Change-Id: If0f229a7b431d7ba0f2fff20e637dee4e85a2dc5
Signed-off-by: Dandawate Saket <>
8 years ago4/5 AV Streaming: Updating GetDurationUs value when requested
Anu Sundararajan [Fri, 17 Sep 2010 09:39:03 +0000 (04:39 -0500)]
4/5 AV Streaming: Updating GetDurationUs value when requested

Logic was not updating these values all the times;

[DR] OMAPS00221190

Change-Id: I5e2ef9a1356f68ba059b5533b9261aad6f2ef191
Signed-off-by: Manuel Contreras <>
8 years ago3/5 AV Streaming: Switching sources when one is full
Anu Sundararajan [Fri, 17 Sep 2010 09:03:54 +0000 (04:03 -0500)]
3/5 AV Streaming: Switching sources when one is full

Adding logic to switch sources when one is full
code is fixing value to minor duration source
it will be mostly audio source

[DR] OMAPS00221190

Change-Id: I3a04aed164fc3aebfc2a866d040d327c42a36d93
Signed-off-by: Manuel Contreras <>
8 years agoMerge "TI Patch: Remove AudioSink close on port reconfiguration" into p-froyo
Keith Deacon [Fri, 17 Sep 2010 16:14:46 +0000 (16:14 +0000)]
Merge "TI Patch:  Remove AudioSink close on port reconfiguration" into p-froyo

8 years agoTI Patch: Remove AudioSink close on port reconfiguration
Daniel Charles [Fri, 17 Sep 2010 15:02:17 +0000 (10:02 -0500)]
TI Patch:  Remove AudioSink close on port reconfiguration

This was a workaround and should be removed once the patch from
google was merged

Change-Id: I61387c970b514a2eff0ebb7eed80a680cfa017f2

8 years ago2/5 AV Streaming: Modifying max values and prepare max durationus
Anu Sundararajan [Fri, 17 Sep 2010 08:41:05 +0000 (03:41 -0500)]
2/5 AV Streaming: Modifying max values and prepare max durationus

Modify Max values for duration and stored changed size;
values are modified at the first 2 seconds depending on
bit consume at this moment.
This patch adds a check for Maxsize reached for first 2 seconds.

[DR] OMAPS00221190

Change-Id: I4649baee8bdac69f755eec961469fded6d1c081f
Signed-off-by: Manuel Contreras <>
8 years agoMerge "5/5 AV Streaming: Increassing caching area to support 720p" into p-froyo
Keith Deacon [Thu, 16 Sep 2010 22:46:45 +0000 (22:46 +0000)]
Merge "5/5 AV Streaming: Increassing caching area to support 720p" into p-froyo

8 years ago5/5 AV Streaming: Increassing caching area to support 720p
Anu Sundararajan [Thu, 16 Sep 2010 08:44:50 +0000 (03:44 -0500)]
5/5 AV Streaming: Increassing caching area to support 720p

Caching data source is fixed value, by default is is set to 10 pages
it is increased to 20 pages of 64K each.

[DR] OMAPS00221190

Change-Id: I3ad5445cb77feb833c158f8cee57acdf8e7fc039
Signed-off-by: Manuel Contreras <>
8 years ago1/5 AV Streaming: Modifying wait lock to reduce cpu usage
Anu Sundararajan [Thu, 16 Sep 2010 07:43:40 +0000 (02:43 -0500)]
1/5 AV Streaming: Modifying wait lock to reduce cpu usage

modifying wait lock timeout to read consume less CPU when not caching
and reduced non-cached timeout in order for faster update and values check.

[DR] OMAPS00221190

Change-Id: I318fe90d94e9a03bc490727caa5144aee1e285e7
Signed-off-by: Manuel Contreras <>
8 years agoMerge commit 'omap-mirror/froyo' into p-froyo
Keith Deacon [Thu, 16 Sep 2010 04:44:16 +0000 (23:44 -0500)]
Merge commit 'omap-mirror/froyo' into p-froyo

8 years agoMerge "Stagefright: Add Ducati H263 Decoder support." into p-froyo
Keith Deacon [Wed, 15 Sep 2010 19:47:55 +0000 (19:47 +0000)]
Merge "Stagefright: Add Ducati H263 Decoder support." into p-froyo

8 years agoStagefright: Add Ducati H263 Decoder support.
Deva R [Mon, 13 Sep 2010 23:27:07 +0000 (04:57 +0530)]
Stagefright: Add Ducati H263 Decoder support.

Enabled Ducati codec support for H263 palyback.
Patch Required a fix to set compressionformat prpoerly, as
ducati codec still publishes MPEG4 as compression type in video port defn.

Signed-Off by: Devaraj Rangasamy <>

Change-Id: I2484a570509c40ff7500d4f26642285b3eddf021

8 years agoFix for playing non-720p H.264 MP/HP content
Barry Woodward [Mon, 13 Sep 2010 18:13:04 +0000 (13:13 -0500)]
Fix for playing non-720p H.264 MP/HP content

Fix provided by Ittiam for playing H.264 MP/HP content using their decoder

Change-Id: I6b3efce6f27900bb215456f191deaa2ac087e780

8 years agoMerge "MediaPlayer: Adding 500 ms threshold to avoid bounce effect when seeking....
Jean Johnson [Wed, 8 Sep 2010 08:43:20 +0000 (08:43 +0000)]
Merge "MediaPlayer: Adding 500 ms threshold to avoid bounce effect when seeking." into p-froyo

8 years agoMerge "OMAP4: Updating patches so that we don't change the master Intent list" into...
Jean Johnson [Wed, 8 Sep 2010 07:53:48 +0000 (07:53 +0000)]
Merge "OMAP4:  Updating patches so that we don't change the master Intent list" into p-froyo

8 years agoMerge "WLAN - Revisit Hotspot/softAP Framework changes for enabling UI" into p-froyo
Keith Deacon [Tue, 7 Sep 2010 19:03:15 +0000 (19:03 +0000)]
Merge "WLAN - Revisit Hotspot/softAP Framework changes for enabling UI" into p-froyo

8 years agoOMAP4: Updating patches so that we don't change the master Intent list
Ricky Bhatia [Fri, 3 Sep 2010 19:01:53 +0000 (14:01 -0500)]
OMAP4:  Updating patches so that we don't change the master Intent list

Change-Id: Iaae18e99f0344c2c4214bbadf49acc98957a94e7
WHY:  Keep isolated from Google's master list of Intents

8 years agoWLAN - Revisit Hotspot/softAP Framework changes for enabling UI
Vishal Mahaveer [Tue, 7 Sep 2010 15:34:23 +0000 (10:34 -0500)]
WLAN - Revisit Hotspot/softAP Framework changes for enabling UI

Updating the Hotspot changes for UI with OMAP_ENHANCEMENT flag

Change-Id: I245c568b6893459eb7ef7b9bf75167c9f4002517

8 years agoAdding support for stagefright AAC decoder.
Anu Sundararajan [Thu, 2 Sep 2010 11:03:50 +0000 (06:03 -0500)]
Adding support for stagefright AAC decoder.

Flash uses stagefright AAC decoder. It cannot use TI AAC decoder for the moment.

The log print is needed for verification purposes while testing.

Change-Id: I46380fb7ecc2d870de40b3d707faaf4446a442bc
Signed-off-by: Anu Sundararajan <>
Patch set 2: rebased; no changes
Signed-off-by: Jean Johnson <>
8 years agoStagefright: I/p buffer count fix for OMAP4 Ducati codecs.
Deva R [Wed, 8 Sep 2010 09:10:12 +0000 (14:40 +0530)]
Stagefright: I/p buffer count fix for OMAP4 Ducati codecs.

Two of the input buffers for CODEC_CONFIG fix for OMAP4 ducati codecs.
(need to save codec config and pack it with first input buffer)
We need atleast 3 or more input buffers to keep playback going.

Today this fix is placed outside for all codecs,
thus breaking other s/w codecs and omap3 dsp codecs.

Now moved the change within OMAP4 Ducati codec check.

Change-Id: Id962a297835c725da11b516ee874129a6999ba28

8 years agoMediaPlayer: Adding 500 ms threshold to avoid bounce effect when seeking.
Manuel Garcia [Fri, 3 Sep 2010 21:16:28 +0000 (16:16 -0500)]
MediaPlayer: Adding 500 ms threshold to avoid bounce effect when seeking.

- The issue happens when doing seeks by tapping forward or backward on the progress
  bar, most of the times an audio buffer is heard 2 or 3 times after the seek.
- This condition is caused because whenever the player reports MEDIA_SEEK_COMPLETE
  event to upper layers, it checks for the position of the cursor and if it has changed
  (which is most of the times probably because of touchscreen high sensitivity) it sends
  another seek command to the codec, most of the times near to the original seek so the
  a bounce effect in the  audio rendering is present.
- Adding a 500 ms threshold for this condition highly reduces the frequency of this

Change-Id: Iae94b4d9ebf91b81c65fa1f3563b50f219eb7978

8 years agoMerge "Audio track: Modified obtain buffer timeout value" into p-froyo
Jean Johnson [Thu, 2 Sep 2010 21:19:34 +0000 (21:19 +0000)]
Merge "Audio track: Modified obtain buffer timeout value" into p-froyo

8 years agoMerge "frameworks-base: HID changes for frameworks/base" into p-froyo
Keith Deacon [Wed, 1 Sep 2010 19:13:50 +0000 (19:13 +0000)]
Merge "frameworks-base: HID changes for frameworks/base" into p-froyo

8 years agoMerge "Update stage fright to support common decoder" into p-froyo
Jean Johnson [Wed, 1 Sep 2010 07:47:32 +0000 (07:47 +0000)]
Merge "Update stage fright to support common decoder" into p-froyo

8 years agoStageFright Test App: Video decoding frame rate support
Prasanna Kumar M.R [Tue, 31 Aug 2010 20:16:24 +0000 (15:16 -0500)]
StageFright Test App: Video decoding frame rate support

Currently the stagefright test app does the video decoding continuously
without depending on the frame rate.

Have modified the test app to handle the decoding based on frame rate.
It can be passed as input parameter in command line and the clips would
be decoded accordingly.
Eg: "-f 30" would ensure that clip is decoded at 30fps.

Incase this option is not specified it would decode continuously as

[DR] OMAPS00222170

Change-Id: Ifeec71009ebecb11cfcdbfc2215467aa969aa815
Signed-off-by: Prasanna KumarM.R. <>
8 years agoUpdate stage fright to support common decoder
a0876447 [Tue, 31 Aug 2010 15:43:50 +0000 (21:13 +0530)]
Update stage fright to support common decoder

Added support for common decoder in stagefright

Change-Id: Ide128729e017352303000084e7dd12e5b53ebc89
Signed-off-by: Dandawate Saket <>
8 years agoAudio track: Modified obtain buffer timeout value
karimuddin sayed [Tue, 31 Aug 2010 10:36:41 +0000 (05:36 -0500)]
Audio track: Modified obtain buffer timeout value

This patch modifies the obtain buffer timeout value based on output
latency. Output latency is calculated using framecount and sample rate.

Current code has timeout value of 10ms which is very less and
observed high frequency of timeouts and high ARM MHz consumption.

Change-Id: I6e8cf581472aa9767a9f66b572f9962065db5b25
Signed-off-by: karimuddin sayed <>
8 years agoframeworks-base: HID changes for frameworks/base
Pavan Savoy [Wed, 25 Aug 2010 19:21:20 +0000 (15:21 -0400)]
frameworks-base: HID changes for frameworks/base

The modifications and the new files allow the phone to act
as a HID host, allowing phone to be connected with other
HID devices such as BT keyboard, mouse and joystick.

Most modifications are wrapped around by the OMAP_ENHANCEMENT
macro/system property.

Change-Id: I3b4f85ff44b53999f028afce9768ac47b7c280f4
Signed-off-by: Pavan Savoy <>
Signed-off-by: Naveen Jain <>
Signed-off-by: Pramodh AG <>
modified:   core/java/android/bluetooth/
modified:   core/java/android/bluetooth/
modified:   core/java/android/server/
modified:   core/jni/
modified:   core/jni/AndroidRuntime.cpp
modified:   core/jni/android_server_BluetoothEventLoop.cpp
modified:   services/java/com/android/server/

new file:   core/java/android/bluetooth/
new file:   core/java/android/bluetooth/IBluetoothHid.aidl
new file:   core/java/android/server/
new file:   core/jni/android_server_BluetoothHidService.cpp

8 years agoMake the default backup configuration "disabled; local transport selected"
Christopher Tate [Tue, 24 Aug 2010 22:37:42 +0000 (15:37 -0700)]
Make the default backup configuration "disabled; local transport selected"

By default out of the box, an Android build will have the backup mechanism in
its "disabled" state and pointed to the LocalTransport test transport.  We
do not want retail devices built without the Google backend to have backup
enabled out of the box; it would cause them to gradually grind away the
cache partition for no good reason.  On those devices with this change,
developers would need to enable backup manually (possibly using the normal
Settings UI; more probably using the 'bmgr' shell tool), but would no longer
also have to manually configure the active transport name.

Device vendors producing Google-enabled products will simply use resource
overlays to configure the default state and transport name for their builds.
When building a product that points to the Google backup transport by default,
the "def_backup_enabled" boolean resource should still be set to 'false' --
the Google backup disclosure activity supplied by GSF will take care of
enabling the backup services if the user opts in to it.  (Basically, vendors
will never have to overlay the def_backup_enabled resource -- the default
value of 'false' is correct for any retail device regardless of whether it
can use the Google backup transport.)

In the SDK build, the default transport will remain the local one, but
the default enable state overridden and set to "true".  This is the ideal
situation for developers: all aspects of the backup mechanism immediately
operative with no manual configuration needed.

Change-Id: I866f8f627b023b338bc7757e61604e6d8a901a34

8 years agoMerge "Add a java OMAP_ENHANCEMENT property definition" into p-froyo
Keith Deacon [Fri, 20 Aug 2010 14:54:12 +0000 (14:54 +0000)]
Merge "Add a java OMAP_ENHANCEMENT property definition" into p-froyo

8 years agoSTAGEFRIGHT: Adding quirk so the client adds more frames per input buffer for MP3.
Manuel Garcia [Thu, 19 Aug 2010 19:50:23 +0000 (14:50 -0500)]
STAGEFRIGHT: Adding quirk so the client adds more frames per input buffer for MP3.

- Adding  an already defined quirk for MP3 under OMAP_ENHANCEMENT macro.
- Now the parser sends more frames to OMX.

Change-Id: Ic6705abbc8adfcadacba50922fcdaa77e3d9bbd3
Signed-off-by: Manuel Garcia <>
Signed-off-by: Daniel Charles <>
8 years agoAdd a java OMAP_ENHANCEMENT property definition
Keith Deacon [Thu, 19 Aug 2010 16:31:43 +0000 (11:31 -0500)]
Add a java OMAP_ENHANCEMENT property definition

Change-Id: I9bb7f2d6f526796356c0696b204b90a07c62b479

8 years agoAdding check for NULL before using AudioPlayer
Barry Woodward [Tue, 17 Aug 2010 19:57:15 +0000 (14:57 -0500)]
Adding check for NULL before using AudioPlayer

AwesomePlayer seeks the audio track to position 0 when it receives a
0 size video buffer, however this causes a segmentation fault in the
case of a video-only file.  This patch checks for NULL before using the

Change-Id: If323c84e9d311ea2f484248a17b5cc15b775c475

8 years agoTI Patch: Audio to wait for first valid Video Buffer
Barry Woodward [Thu, 12 Aug 2010 22:11:25 +0000 (17:11 -0500)]
TI Patch: Audio to wait for first valid Video Buffer

This is a fix for patch 5628 which had to be reverted because it was breaking play after pause because the FIRST_FRAME flag is set after a pause.  This patch
removes the FIRST_FRAME condition which is not necessary for OMAP3 and was only included in the patch to protect OMAP4 which uses PV codecs with different behavior.
This patch instead uses #ifndef TARGET_OMAP4 to protect OMAP4.

Change-Id: Ieadfbde3d8ddc09100eca417cc551672dad70680
Note: This patch is equivalent to Patch Set 2 of 5628.

8 years agoRevert "TI Patch: Audio to wait for first valid Video Buffer"
Jean Johnson [Thu, 12 Aug 2010 15:52:30 +0000 (10:52 -0500)]
Revert "TI Patch:  Audio to wait for first valid Video Buffer"

This reverts commit aa365b810225a2217b67333e099c90c00fa30048.

Change-Id: I519037cd88485dd698df7774f3b9f3abdcde022a

Causing problems with pause -- Essentially this patch causes
repeated pauses to cause the audio to bo back to the start of
the clip and replay until the paused point is found.

Reverting for L27.5.3 release.

Signed-off-by: Jean Johnson <>
8 years agoStagefright: Thumbnail buffer optimization is cleaned up, avoided for AVPlayback
Deva R [Thu, 12 Aug 2010 19:32:41 +0000 (01:02 +0530)]
Stagefright: Thumbnail buffer optimization is cleaned up, avoided for AVPlayback

Thumbnail buffer count optimization, which involves setting
nBufferCountActual to minimal, is avoided from Video Playback calls.

Signed-Off by: Devaraj Rangasamy <>

Change-Id: I213dee1fa1c75a94e3c6a0f7dd8b4a0d9c682e38

8 years agoFixed Seg Fault in MTS Stress test RecordVideoAndPlayback.
Anu Sundararajan [Mon, 9 Aug 2010 16:09:53 +0000 (11:09 -0500)]
Fixed Seg Fault in MTS Stress test RecordVideoAndPlayback.

In this MTS test, playback is performed without using the overlay.
Therefore, the VideoRenderer object was null and accessing it
caused a Seg Fault.


Change-Id: I21a5061a86abdb1a433fa50c667235823c607def
Signed-off-by: Anu Sundararajan <>
Patch Set 2: rebase of patch set one - no changes.

8 years agoMerge "Stagefright: Handling playback negative seek scenario" into p-froyo
Jean Johnson [Thu, 12 Aug 2010 05:48:00 +0000 (05:48 +0000)]
Merge "Stagefright: Handling playback negative seek scenario" into p-froyo

8 years agoTI Patch: Audio to wait for first valid Video Buffer
Daniel Charles [Tue, 3 Aug 2010 18:46:25 +0000 (13:46 -0500)]
TI Patch:  Audio to wait for first valid Video Buffer

On H.264 streaming, mp and hp will produce empty buffers
at the beginning of rendering.  These buffers are not letting
the video to play correctly when the first valid buffer comes.

Audio will be seeking to the origin position until the first valid
video buffer appears.

Patch Set 3: This patch avoids that zero-size buffers during playback
can result on undesired seek.  It should address the comments from the
reviewers and should be validated on OMAP4

Patch Set 4:  Remove time check on audio to avoid confusion with a/v sync.

Patch Set 5: Video only clips were causing a segmenetation fault as
mAudioPlayer is not created in such cases.  Case is considered now.
Change-Id: I504952668b99b79e57bc6172df2c5a64d31b2b55

8 years agoMerge "Bluetooth: LCD wakeup during remote BT pairing request. This change fixes...
Keith Deacon [Wed, 11 Aug 2010 22:36:23 +0000 (22:36 +0000)]
Merge "Bluetooth: LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote Initiated pairing request when android is in suspend" into p-froyo

8 years agoStagefright: Optimize outbut buffer count during thumbnail generation
Deva R [Tue, 10 Aug 2010 12:34:12 +0000 (18:04 +0530)]
Stagefright: Optimize outbut buffer count during thumbnail generation

As of L27.5.2, SF allocates 20 buffers on output port.
This is limited as per requirement in case of thumbnail generation.
AVPlayback too need to be optimized.

Signed-off by: Devaraj Rangasamy <>

Change-Id: I55c0673fb6e4562b0c45b6d7b8a98f5f72ce7543

8 years agoMerge "WLAN - Hotspot/softAP: Framework changes for enabling UI" into p-froyo
Keith Deacon [Mon, 9 Aug 2010 20:06:54 +0000 (20:06 +0000)]
Merge "WLAN - Hotspot/softAP: Framework changes for enabling UI" into p-froyo

8 years agoMerge "COMMENT ONLY change to fix some formatting glitches and (more importantly...
Dan Egnor [Fri, 6 Aug 2010 23:39:02 +0000 (16:39 -0700)]
Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

8 years agoStagefright: Handling playback negative seek scenario
Prasanna Kumar M.R [Fri, 6 Aug 2010 22:43:51 +0000 (17:43 -0500)]
Stagefright: Handling playback negative seek scenario

This patch has change to fix the issue while performing
the stagefright "b 3" tests. They were failing as negative
offset was calculated and used for seek.

Actually in the SF middleware we have condition to check the
parameters. If the seek value is < 0, then android assert is
triggerred which leads to the issue. Actually as per the test app,
the test has to seek and continue decoding till the EOF.
Hence have modified the seek position handling accordingly.

Change-Id: Iae8bc4e08d4fd6f84bcfc23a3dfc7542fe585ef6
Signed-off-by: Prasanna KumarM.R. <>
8 years agoOMAP4 : Google Camera framework changes to pass nOffset and stride to the encoder
Sundar Raman [Fri, 6 Aug 2010 21:29:14 +0000 (16:29 -0500)]
OMAP4 : Google Camera framework changes to pass nOffset and stride to the encoder

This patch contains the modifications to Google Camera framework to pass the nOffset and
stride to the Video encoder

nOffset specifies the number of bytes from the start of the buffer to where there valid image data begins
stride specifies the width of the buffer in bytes

Change-Id: I23a2d281eb0c83208129cf60364c2da33b2a4086
Signed-off-by: Sundar Raman <>
8 years agolibstagefright: Add OMAP_ENHANCEMENT to AwesomePlayer.cpp and OMXCodec.cpp were required
Deva R [Fri, 6 Aug 2010 10:46:53 +0000 (16:16 +0530)]
libstagefright: Add OMAP_ENHANCEMENT to AwesomePlayer.cpp and OMXCodec.cpp were required

This patch isolating changes made by TI within #ifdef OMAP_ENHANCEMENT
to all the missing changes done at:

Fixed OMAP4 kEncoderInfo table.
Cleaned up commented entries in TI decoder/encoder table

Change-Id: Id20560ce65061b4dc0e5a90b5d72aa36872b02b5
Signed-off-by: Jorge E. Solano <>
Signed-off-by: Devaraj Rangasamy <>
8 years agoMerge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroll...
Adam Powell [Fri, 6 Aug 2010 01:33:31 +0000 (18:33 -0700)]
Merge "DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller" into froyo

8 years agoMerge "Changed SyncOperation.toKey() to not rely on the implementation of Account...
Fred Quintana [Fri, 6 Aug 2010 00:36:27 +0000 (17:36 -0700)]
Merge "Changed SyncOperation.toKey() to not rely on the implementation of Account.toString()" into froyo

8 years agoChanged SyncOperation.toKey() to not rely on the implementation of
Fred Quintana [Thu, 5 Aug 2010 21:14:49 +0000 (14:14 -0700)]
Changed SyncOperation.toKey() to not rely on the implementation of

bug: 2898033
Change-Id: I6bfac976127190d2d667312df7aa9c7d57b21555

8 years agoDO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller
Adam Powell [Fri, 23 Jul 2010 22:49:03 +0000 (15:49 -0700)]
DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller

Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63

8 years agoMerge "fix xml sample error" into froyo
Scott Main [Thu, 5 Aug 2010 22:49:08 +0000 (15:49 -0700)]
Merge "fix xml sample error" into froyo

8 years agofix xml sample error
Scott Main [Thu, 5 Aug 2010 22:44:26 +0000 (15:44 -0700)]
fix xml sample error

Change-Id: Ifd188a5866382a79c2c9de94c0682b707baffdcf

8 years agoMerge "Checkin initial bluetooth stress tests." into froyo
Eric Rowe [Thu, 5 Aug 2010 21:49:22 +0000 (14:49 -0700)]
Merge "Checkin initial bluetooth stress tests." into froyo

8 years agoCheckin initial bluetooth stress tests.
Eric Rowe [Thu, 29 Jul 2010 19:11:29 +0000 (12:11 -0700)]
Checkin initial bluetooth stress tests.

Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f

8 years agofix some doc errors in the resources;
Scott Main [Thu, 5 Aug 2010 00:33:33 +0000 (17:33 -0700)]
fix some doc errors in the resources;
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502

8 years agolibstagefright: Add OMAP_ENHANCEMENT label
Jorge E. Solano [Mon, 2 Aug 2010 15:45:20 +0000 (10:45 -0500)]
libstagefright: Add OMAP_ENHANCEMENT label

This patch add OMAP_ENHANCEMENT label to patches:

Change-Id: Ia1a416238bad01e6dc60ee3fc53baba001b0e8f4
Signed-off-by: Jorge E. Solano <>
8 years agofix doc bugs
Scott Main [Mon, 2 Aug 2010 18:50:36 +0000 (11:50 -0700)]
fix doc bugs

Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157

8 years agoWLAN - Hotspot/softAP: Framework changes for enabling UI
Vishal Mahaveer [Mon, 2 Aug 2010 22:46:01 +0000 (17:46 -0500)]
WLAN - Hotspot/softAP: Framework changes for enabling UI

Changes for enabling softAP/Hotspot and tethering feature on froyo UI.

We have two different deivers for normal wifi and softAP, so the changes here are
to accomadate loading of different driver (softAP or normal wifi)

Change-Id: Ida2cdd3b4716248e035335ab86b3fde52a9058a5

8 years agoMerge "MediaPlayerService:Fix to identify the correct player type" into p-froyo
Jean Johnson [Tue, 3 Aug 2010 22:14:24 +0000 (22:14 +0000)]
Merge "MediaPlayerService:Fix to identify the correct player type" into p-froyo

8 years agoMerge "STAGEFRIGHT: AV Clips with AAC-SBR codecs have frame drops" into p-froyo
Jean Johnson [Tue, 3 Aug 2010 21:48:50 +0000 (21:48 +0000)]
Merge "STAGEFRIGHT: AV Clips with AAC-SBR codecs have frame drops" into p-froyo

8 years agoSTAGEFRIGHT: AV Clips with AAC-SBR codecs have frame drops
Deva R [Tue, 3 Aug 2010 20:07:23 +0000 (01:37 +0530)]
STAGEFRIGHT: AV Clips with AAC-SBR codecs have frame drops

Patchset 1:
For s/w pv aac codec, quirks should be set properly
enabling kDecoderNeedsPortReconfiguration flag.

Patchset 2:
Placed changes under TARGET_OMAP4 macros. whitespaces taken care

Patchset 3:
Refiend quirks to (kNeedsFlushBeforeDisable,kDecoderNeedsPortReconfiguration) after reviw.

Signed-Off by: Devaraj Rangasamy <>

Change-Id: I42a62215da73bd520522a6b64dd789ece2d60316

8 years agoCOMMENT ONLY change to fix some formatting glitches and
Dan Egnor [Tue, 3 Aug 2010 01:22:09 +0000 (18:22 -0700)]
COMMENT ONLY change to fix some formatting glitches and
(more importantly) clarify issues surrounding removed accounts.

Change-Id: I19e6c0e536e46b6d219c808bb86e88edd7e6f378

8 years agoupdate device dashboard
Scott Main [Tue, 3 Aug 2010 00:22:11 +0000 (17:22 -0700)]
update device dashboard

Change-Id: I79ebf6fa740e19f32d724e9b8a387f2a143fdf7a

8 years agoAdd PhoneSubInfo.getCompleteVoiceMailNumber.
Wink Saville [Mon, 2 Aug 2010 18:05:28 +0000 (11:05 -0700)]
Add PhoneSubInfo.getCompleteVoiceMailNumber.

PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5

8 years agoMerge "Doc change: Add nexus one to dev phones." into froyo
Scott Main [Mon, 2 Aug 2010 16:16:30 +0000 (09:16 -0700)]
Merge "Doc change: Add nexus one to dev phones." into froyo

8 years agoDoc change: Cleanup for licensing doc.
Dirk Dougherty [Thu, 29 Jul 2010 02:37:01 +0000 (19:37 -0700)]
Doc change: Cleanup for licensing doc.

Change-Id: Iff046768d70adf0489f5241212061045cef2572f

8 years agoMerge "Add a missing break; to restore old functionality and not turn off the screen...
Andreas Huber [Fri, 30 Jul 2010 15:05:56 +0000 (08:05 -0700)]
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo

8 years agolibCameraservice: Isolates OMAP related changes within #ifdef OMAP_ENHANCEMENT
Emilian Peev [Fri, 30 Jul 2010 07:30:19 +0000 (10:30 +0300)]
libCameraservice: Isolates OMAP related changes within #ifdef OMAP_ENHANCEMENT

Change-Id: I15365f153d89313404c47225f192eb14de42820c
Signed-off-by: Emilian Peev <>
8 years agoMerge branch 'froyo' of git:// into...
The Android Open Source Project [Fri, 30 Jul 2010 00:45:56 +0000 (17:45 -0700)]
Merge branch 'froyo' of git://android.git./platform/frameworks/base into HEAD

8 years agofix inaccurate copyrights
Jean-Baptiste Queru [Fri, 30 Jul 2010 00:35:37 +0000 (17:35 -0700)]
fix inaccurate copyrights

Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd

8 years agoMerge "Fixes regarding densities in "Providing Resources" documentation page." into...
Gilles Debunne [Fri, 30 Jul 2010 00:39:32 +0000 (17:39 -0700)]
Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo

8 years agoMerge "Fixed doc typos in" into froyo
Gilles Debunne [Fri, 30 Jul 2010 00:39:18 +0000 (17:39 -0700)]
Merge "Fixed doc typos in" into froyo

8 years agoFixed doc typos in
Gilles Debunne [Wed, 28 Jul 2010 16:00:41 +0000 (09:00 -0700)]
Fixed doc typos in

Bad links.

Cherry-pick from master for a documentation update.,59176

Change-Id: Ib69b05c09fc80434cb9cd79d61fae4035adc1970

8 years agoFixes regarding densities in "Providing Resources" documentation page.
Gilles Debunne [Wed, 28 Jul 2010 16:01:34 +0000 (09:01 -0700)]
Fixes regarding densities in "Providing Resources" documentation page.

The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Cherry-picked from master CL 59188.

Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c

8 years agoMerge from open-source froyo
The Android Open Source Project [Thu, 29 Jul 2010 22:38:41 +0000 (15:38 -0700)]
Merge from open-source froyo

Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76

8 years agoFix a bug where we cleaned an apps external data when upgrading it. :(
Dianne Hackborn [Thu, 29 Jul 2010 20:57:56 +0000 (13:57 -0700)]
Fix a bug where we cleaned an apps external data when upgrading it. :(

Change-Id: I0eee1e7062d334c66d6daa3c43e11a292263aada

8 years agoMediaPlayerService:Fix to identify the correct player type
Prasanna Kumar M.R [Thu, 29 Jul 2010 16:47:22 +0000 (11:47 -0500)]
MediaPlayerService:Fix to identify the correct player type

This patch has change to perform case insensitive compare of the URL to
identify the player type to be used. Otherwise if the case donot match
it might default to stage fright player which might not support the
format and hence would fail. Faced issue with WMV which had filename and
extensions in upper case.

Change-Id: Ie0b61b5ce9e7e07c1fe49f122e4a84d49f5100ca
Signed-off-by: Prasanna KumarM.R. <>
8 years agoSquashed commit of the following:
Andreas Huber [Tue, 20 Jul 2010 16:44:34 +0000 (09:44 -0700)]
Squashed commit of the following:

commit 4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <>
Date:   Tue Jul 20 09:21:17 2010 -0700

    Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.

    Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
    related-to-bug: 2826841

commit 09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <>
Date:   Sun Jul 18 17:57:01 2010 -0700

    Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.

    Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8

commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <>
Date:   Thu Jul 8 20:56:13 2010 -0700

    Enable the support for decoding audio with AAC+ and eAAC+ features

    bug - 282684

    Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b

Change-Id: I012f1179e933b6d1345d2368f357576c722485f7

8 years agoAdd a missing break; to restore old functionality and not turn off the screen after...
Andreas Huber [Tue, 27 Jul 2010 23:49:10 +0000 (16:49 -0700)]
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.

Change-Id: Ib71113a3bc5aa5fdc088ab4ac3627352499ad3fa

8 years agoSTAGEFRIGHT: Ducati Codec (H264/MPEG4) Integaration to Froyo Stagefright.
Deva R [Thu, 29 Jul 2010 14:06:13 +0000 (19:36 +0530)]
STAGEFRIGHT: Ducati Codec (H264/MPEG4) Integaration to Froyo Stagefright.

Patch Set 1:
H264 playback working, with some issues, MPEG4 to be tested next.

Patch Set 2:
A bit cleaned up patch.
With Ducati H264 codec, Playaback works fine.
But first FBD never comes, so a crash happens in the end.
No FBD comes for very low-res clips. Yet to add MPEG4 codec.

Patch Set 3:
Fixed H264/MPEG4 QCIF,720,1080p all resolution clip issues.
Playback, seek, AVsync, back to back playback works fine.
 - Updated input buffer size durig input port configuration.
 - AVPlayback is broken for Higher resolution as L25x audiocodec is hardcoded to ittiam.aac codec.
 - Added flags to differentiate VideoPlayback/Thumbnail Generation,to aid usage of UseBuffer/AllocateBuffer accordingly. This was causing thumbnail generation to hang.

Patch Set 4:
Added NV12=>RGB565 color conversion support to generate thumbnail for Ducati decoded videos.

Patch Set 5:
Removed frequent redundant traces traces

Patch Set 6:
Fixed NV12 => RGB16 5:6:5 conversion issue. Thumbnails work good.
Fixed Review comments.
Removed MPEG4D hacks, fixed arbitrary Mediabuffer range size with frame size.
Took care of changes further not to impact OMAP3/PV codecs.
1080p higher Mbps, bframe clips work fine.
Pause/resume, FFW/Rewind, back-to-back works fine. AVSync works ok, needs to be tested more.

Patch Set 7:
Migrated to L27.5 setup. latest DOMX,Syslink,tiler,kernel,ES2.0
Fixed nStride issue for video playback. 1D buffer for thumbnail.

Patch Set 8:
Fixed typo in CodecConfig variable.
Removed redundant comment,trace in ColorConverter.cpp

Patch Set 9:
Added OMAP_ENHANCEMENT macro support.

Open Items:
 - single i-frame clips doesnt play properly on regressive seek (to be confirmed)
 - player::suspend() was crashing with Nullpointer and avoid using temporary hack. (with FIXME comments in place)

Note: Patch is almost final. we'll review and merge ASAP.
Note: From patch set7, L27.5 setup is required. It wont work on L27.4 codebase (kernel,domx,syslink,ducati)

Change-Id: I3e412088978ac9c4edfb3ed32d390e14febddd2a
Signed-off-by: Devaraj Rangasamy <>
8 years agoIsolating changes made by TI within #ifdef OMAP_ENHANCEMENT
Anu Sundararajan [Wed, 28 Jul 2010 14:43:14 +0000 (09:43 -0500)]
Isolating changes made by TI within #ifdef OMAP_ENHANCEMENT

Patch Set 2: Minor change to OMXCodec.cpp.
Change-Id: I07bae89f3940c51eb5a80b27d02572fd26a68a7d
Signed-off-by: Anu Sundararajan <>
8 years agoMerge "TI Patch: Add quirk for ARM AAC Decoder port reconfiguration" into p-froyo
Jean Johnson [Thu, 29 Jul 2010 04:38:08 +0000 (04:38 +0000)]
Merge "TI Patch:  Add quirk for ARM AAC Decoder port reconfiguration" into p-froyo

8 years agoMerge "fix markup error bug:2871538" into froyo
Scott Main [Wed, 28 Jul 2010 21:20:18 +0000 (14:20 -0700)]
Merge "fix markup error bug:2871538" into froyo

8 years agofix markup error
Scott Main [Wed, 28 Jul 2010 21:14:40 +0000 (14:14 -0700)]
fix markup error

Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f

8 years agoMinor changes to ContentProvider javadoc to improve consistency.
Dan Egnor [Wed, 28 Jul 2010 19:28:04 +0000 (12:28 -0700)]
Minor changes to ContentProvider javadoc to improve consistency.

Change-Id: I710f618c94ffd5d6368ef04a39ac08f675bec11b

8 years agoMerge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Brad Fitzpatrick [Tue, 27 Jul 2010 23:44:53 +0000 (16:44 -0700)]
Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo

8 years agoCOMMENT ONLY change to clarify ContentProvider documentation.
Dan Egnor [Tue, 27 Jul 2010 23:32:17 +0000 (16:32 -0700)]
COMMENT ONLY change to clarify ContentProvider documentation.

Gets a little more specific about thread behavior, and makes
pointed comments about not doing too much work in onCreate().

Change-Id: I682f0eb7d7559babee901ed26642751a6ba0a1ea

8 years agoTI Patch: Add quirk for ARM AAC Decoder port reconfiguration
Daniel Charles [Fri, 23 Jul 2010 21:27:01 +0000 (16:27 -0500)]
TI Patch:  Add quirk for ARM AAC Decoder port reconfiguration

ARM AAC Decoder is reporting a port reconfiguration based on the
input stream information after decoding the first sample.

Stagefreight was assuming all the messages when processing buffers
as EOS and the port reconfiguration messages were ignored and the
playback stopped immediately.

Once the port reconfiguration message is parsed it is necessary to
inform the audio renderer, AudioSink, that there was a change for
output port parameters.  The AudioSink, as it lacks methods for
these specific changes, is close, open and start to start the playback.

The AudioSink will be restarted only when a Port reconfiguration takes

Patch Set 5: Patch follows guidelines for google code.  This is a TI Patch
yet to be decided if it will go to google's master branch.
Change-Id: I5d8bce7326c4ae45995fe1e3688b5890e2fb6e0b

8 years agoMerge "Add a method to let a properly permissioned app directly manipulate the user...
Joe Onorato [Tue, 27 Jul 2010 16:05:05 +0000 (09:05 -0700)]
Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout.  We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo

8 years agoMerge "MTS: Enable testWMA9SeekToEnd test case." into p-froyo
Jean Johnson [Tue, 27 Jul 2010 05:03:39 +0000 (05:03 +0000)]
Merge "MTS: Enable testWMA9SeekToEnd test case." into p-froyo

8 years agoDoc change: Add docs for licensing service.
Dirk Dougherty [Wed, 21 Jul 2010 01:38:53 +0000 (18:38 -0700)]
Doc change: Add docs for licensing service.

Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d

8 years agoCamcorder : Support for No Audio feature
Sreenidhi Koti [Fri, 23 Jul 2010 05:23:42 +0000 (10:53 +0530)]
Camcorder : Support for No Audio feature

By default NB-AMR is enabled for No audio. This patch supports no audio.

Signed-Off by : Sreenidhi Koti <>

Change-Id: I22ee0829e04f63c3b096906031542ee7a8c339a3

Patch Set 2 -- patch set 1 with spaces instead of tabs.  Fixing file
   permissions change.

8 years agoMTS: Enable testWMA9SeekToEnd test case.
Rajesh Vandanapu [Mon, 26 Jul 2010 09:36:10 +0000 (15:06 +0530)]
MTS: Enable testWMA9SeekToEnd test case.

testWMA9SeekToEnd is supressed so the test is not passing.
it is enabled with this patch.
DR OMAPS00221820

Change-Id: I0e99e86386019a00901f6a9ccca1c8c5a40036f1
Signed-off-by: Vandanapu Rajesh <>
8 years agoAdd a method to let a properly permissioned app directly
Joe Onorato [Sat, 24 Jul 2010 15:50:05 +0000 (11:50 -0400)]
Add a method to let a properly permissioned app directly
manipulate the user activity timeout.  We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.

Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa

8 years agoDoc change: Add nexus one to dev phones.
Dirk Dougherty [Fri, 23 Jul 2010 20:26:24 +0000 (13:26 -0700)]
Doc change: Add nexus one to dev phones.

Change-Id: I45d0207bff857db7355da6b7736d6a6a729a878a

8 years agoBluetooth: LCD wakeup during remote BT pairing request.
Bheemsen Kulkarni [Fri, 23 Jul 2010 07:12:02 +0000 (12:42 +0530)]
Bluetooth: LCD wakeup during remote BT pairing request.
This change fixes the issue of LCD not coming up during remote
Initiated pairing request when android is in suspend

Google Accepted this change and it is part of Google master tree

Change-Id: I792eae300f475c7703115d56c09be954659b9a69
Signed-off-by: Bheemsen Kulkarni <>
8 years agoMerge "Avoid leaking file descriptors when returning drop box events." into froyo
Dan Egnor [Wed, 21 Jul 2010 20:53:23 +0000 (13:53 -0700)]
Merge "Avoid leaking file descriptors when returning drop box events." into froyo

8 years agoAvoid leaking file descriptors when returning drop box events.
Dan Egnor [Tue, 20 Jul 2010 22:24:09 +0000 (15:24 -0700)]
Avoid leaking file descriptors when returning drop box events.

We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise
it leaks when returning the value to the caller (the flag gets lost).  Change
the way DropBoxManager.Entry gets serialized so that it uses a bit of its own
flags value to track whether the data is a byte[] or a ParcelFileDescriptor.

Modify the dropbox unit test to add extensive checking of Entry serialization
and deserialization under various circumstances, and to include a regression
test to ensure that FD leaking doesn't happen.

Bug: 2847738
Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193

8 years agoFix a merge problem with html mms
Tom Taylor [Wed, 21 Jul 2010 17:49:48 +0000 (10:49 -0700)]
Fix a merge problem with html mms

Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888

Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103