66020 Commits

Author SHA1 Message Date
John Grossman
8f267c4a47 LibAAH_RTP: Fix a deserialization bug. DO NOT MERGE
Fix for bug 6446715

Fix a deserialization bug which was causing an assertion failure in
stagefright and bringing down the entire media server.  Basically, you
will hit this any time you play a track longer than ~2147 seconds.
(Technically, the crash will happen any time the play pointer at a
 position which is ~2147 * (1 * 2N) where N >= 0)

Change-Id: Ic0d371b0f6c29fddf0a033f5de08a70b3e63c854
2012-06-13 12:56:22 -07:00
Christopher Tate
115284bc12 Merge "Support volume-changed sounds on master-volume-only configs" into ics-aah 2012-05-25 11:55:04 -07:00
John Grossman
03f2fb3cb9 AAH_RX: Add the ability to control volume and stream type.
DO NOT MERGE

Change the AAH_RX player so that it implements MediaPlayerHWInterface
(instead of just MediaPlayerInterface) so the app level can control
the rendering volume of individual RX player instances as well as the
stream type of the audio tracks created by the RX player.

Change-Id: Ieff1ea774f7981227546744883ee4b4e87a2cd2a
Signed-off-by: John Grossman <johngro@google.com>
2012-05-24 17:48:17 -07:00
Christopher Tate
c4b78d206f Support volume-changed sounds on master-volume-only configs
Some products manipulate only the master volume, and the existing
code does not play volume-change tones when the master volume
is adjusted.  This CL includes some config-driven behavior that
will play those tones (via the system stream) if desired.

Bug 6498986

Change-Id: I2415773325d0a0039efc67897bc371b1f2e18063
2012-05-24 17:30:39 -07:00
Manuel Roman
9d98a08975 Check result handler is not null
If caller passes a null result handler to the proxy methods, we need
to check it when getting the result. Otherwise we try to invoke a method
on a null object

Change-Id: Ic2f456c36cb542b782b6a6d0d4d607ccf0987496
2012-05-23 14:25:31 -07:00
Mike J. Chen
993f8a8c65 bootanimation: Remove a property_set that is causing a warning in dmesg. DO NOT MERGE
Remove a property_set() call that causes the kernel error log:

<3>[   36.437164] init: sys_prop: permission denied uid:1003  name:service.bootanim.exit

This set fails because the property is read only for non-root processes.
It was added by Kevin as part of the clean exit of the boot animation
change, but it's only needed when testing the boot animation from cmdline.
When called from init, init will clear the property itself before it
reruns the boot animation.

Change-Id: I07563009f57d576da8063708cbe66ff08f6757c8
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-05-22 17:07:39 -07:00
Jason Simmons
b088ed7e23 Merge "Seek to the beginning if start() is called on an AAH_TXPlayer that has completed playback" into ics-aah 2012-05-18 18:27:48 -07:00
Jason Simmons
853d8c7f08 Seek to the beginning if start() is called on an AAH_TXPlayer that has completed playback
Bug: 6486022
Change-Id: I4daaf0f1feb1047a12480397598af6c52f54a6b6
2012-05-18 18:21:47 -07:00
Mike J. Chen
faf0972644 DO NOT MERGE
This reverts commit d514fe7ec53e7c8f63dd2f8776e905d37acdbc9a.

We're not going to support < 1080p without scaling after all.

Change-Id: I54b17f3ca02351382ddf90c729c6154733c95011
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-05-17 12:03:12 -07:00
Mike J. Chen
d514fe7ec5 DO NOT MERGE
Change BootAnimation's initial display size query to check
a system property instead of the SurfaceFlinger's display
size (which comes from the frame buffer) in case the hwc
choose a display size that is smaller than the full frame
buffer.  The hwc would do this if the monitor's preferred/native
resolution is less than 1080p.

Change-Id: I33bf06fe06a21e778cf3f23eaf0374346a6e2aa0
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-05-16 10:16:01 -07:00
Jason Simmons
1903a73248 Merge "Avoid calling BluetoothSocket.destroyNative twice" into ics-aah 2012-05-07 09:12:01 -07:00
Jason Simmons
34b2feb041 Avoid calling BluetoothSocket.destroyNative twice
If the destroyNative JNI method is called twice, it will attempt to free
the socketData twice, and the second free will cause an assertion failure.

To avoid this, check whether mSocketState has already been set to CLOSED
while holding the write lock.  If it has, then destroyNative has already
been called and should not be called again.

Bug: 3096033
Change-Id: Ic7c0bbf21823d389b26919da8c533d8ac4d49064
2012-05-03 19:46:01 -07:00
Christopher Tate
b89ce43499 Add streamlined config-based path for no volume key sounds
This lets us avoid a Binder roundtrip to the system process during
volume changes.  Previously volume change would be staged at key-down,
then applied at key up in tandem with playback of the sonic feedback
about volume key presses.  The reason for this two-stage handling was
to defer playback of the sound [at the target volume] while the volume
key was being held for repeat.

On some devices volume is always sent as key down/up pairs rather than
down-repeat-up sequences. On these devices it is more efficient to
apply the new volume immediately during down handling, and have the
up handling be a no-op.  This CL adds a configuration resource item
selecting this new fast path.

Bug 6433943

Change-Id: Icffa56e958243b841d514e2fe4609ba3a7b20f14
2012-05-03 15:41:34 -07:00
Kevin Hester
e7d85994cb Exit boot animation cleanly. DO NOT MERGE
The desc.txt file can now mark parts as 'must finish cleanly' by using
'c' as the part line prefix rather than 'p'.  If so indicated, if the
bootanimation is asked to quit it will do so only after waiting to
finish that part.

I considered either making init.c service killing smarter or promoting
bootanim to be a bindable service with a requestExit method.  However,
these changes are probably too big/risky given our ship date.  So
I used a property as a mailbox between SurfaceFlinger and bootanim.

Change-Id: I40b219c9117c97c3fc94855059ea13fe4ceb3d2b
2012-04-27 09:43:02 -07:00
Travis Geiselbrecht
f4b6628e50 BootAnimation: fix bug to delay the appropriate amount of time per frame
Change-Id: I300b67a97a9a685cec59df12d8d605c2b0b49180
2012-04-24 14:14:55 -07:00
Quddus Chong
5c84720322 am 4fd13fda: docs: Fixed typos.
* commit '4fd13fda636a3a5ab247367da23ae1527a66d8aa':
  docs: Fixed typos.
2012-04-24 09:42:09 -07:00
Quddus Chong
4fd13fda63 docs: Fixed typos.
Change-Id: I260ab8c5ea797e5bd8b9b2fcbd0d5dc6e5e8bc7c
2012-04-23 17:29:57 -07:00
Scott Main
aab79e541a am d5955b02: Merge "docs: add section to basic intent class about using the activity chooser" into ics-mr1
* commit 'd5955b02365d35f3f9e8fc261fc22e6d2ac9f6bf':
  docs: add section to basic intent class about using the activity chooser
2012-04-23 15:13:04 -07:00
Scott Main
d5955b0236 Merge "docs: add section to basic intent class about using the activity chooser" into ics-mr1 2012-04-23 15:11:04 -07:00
Scott Main
1cf9255ec7 docs: add section to basic intent class about using the activity chooser
Change-Id: Ib2a889429895a24ced2db365d6e4afdf44c3086e
2012-04-23 14:55:11 -07:00
Quddus Chong
2bf56f009f am 378da38d: docs: Fixed the url for the Aplication Licensing link. Bug: 6322460
* commit '378da38db81093b0ce98dbe24ade3de0bb87bd5c':
  docs: Fixed the url for the Aplication Licensing link. Bug: 6322460
2012-04-23 14:04:54 -07:00
Quddus Chong
378da38db8 docs: Fixed the url for the Aplication Licensing link.
Bug: 6322460

Change-Id: I9a4ce2b79adf1470fd7a7b7b0f085f68544d1a4d
2012-04-23 12:55:35 -07:00
Scott Main
9b930d2134 am 40a33f3b: Merge "docs: add meta description to first training docs" into ics-mr1
* commit '40a33f3b0a3e29ddc98d31fbd9bf02a32aea5193':
  docs: add meta description to first training docs
2012-04-20 14:20:31 -07:00
Scott Main
40a33f3b0a Merge "docs: add meta description to first training docs" into ics-mr1 2012-04-20 14:18:29 -07:00
Scott Main
34bf13d593 docs: add meta description to first training docs
Change-Id: Iaf04ffbd10c8c5e1cf3896876fecb59f038127a7
2012-04-20 14:16:05 -07:00
Scott Main
7d48a823b4 am f90f4ed1: docs: fix more broken links
* commit 'f90f4ed19c1bd7e0492c1aa1494a1d8ed5185275':
  docs: fix more broken links
2012-04-20 14:09:50 -07:00
Scott Main
f90f4ed19c docs: fix more broken links
Change-Id: Ia5317f5ead8ac9810c893576596bd3a80f6ecbdb
2012-04-20 11:53:32 -07:00
Scott Main
eff0c081ee am 71427bae: docs: fix broken link
* commit '71427bae84f51b5c269b2520c36d2811491e67fb':
  docs: fix broken link
2012-04-20 11:36:45 -07:00
Scott Main
71427bae84 docs: fix broken link
Change-Id: I24c44689713f7b27acde1d0b023598a5f7e6bb3b
2012-04-20 11:25:45 -07:00
Scott Main
08e9e9600a am ffad98c7: docs: fix markup error in resource sidenav
* commit 'ffad98c72e1ee9101065e19318c74ab4c735a477':
  docs: fix markup error in resource sidenav
2012-04-19 19:48:50 -07:00
Scott Main
ffad98c72e docs: fix markup error in resource sidenav
Change-Id: I70f2c906e83b96661005d24eaef448ec9246590e
2012-04-19 19:31:29 -07:00
Scott Main
5da1c17930 am 5f8173f3: docs: fix javadoc link
* commit '5f8173f35b241e2f15dad1218b07216c9163b80d':
  docs: fix javadoc link
2012-04-19 19:28:01 -07:00
Scott Main
5f8173f35b docs: fix javadoc link
Change-Id: Ife9c4948c484eaf1e01dbb269bc61e657cc5527e
2012-04-19 19:24:50 -07:00
Scott Main
2442e1e067 am 421854e6: docs: add fragments class to training TOC
* commit '421854e6e8fe3418d22ae444567a06b5f308c896':
  docs: add fragments class to training TOC
2012-04-19 19:22:11 -07:00
Scott Main
421854e6e8 docs: add fragments class to training TOC
Change-Id: Ib54257d74f43eb85855685b49f8b0fa70ca6e984
2012-04-19 19:18:44 -07:00
Scott Main
72c13446b4 am 67e988e0: Merge "docs: for AU basic training on fragments including ZIP for sample app" into ics-mr1
* commit '67e988e0e96dcd0f9c8f07e5b685dc7c8224a884':
  docs:  for AU basic training on fragments including ZIP for sample app
2012-04-19 19:09:37 -07:00
Scott Main
559f184a89 am 6ea11c0a: Merge "docs: Add 101 class on activity lifecycle including ZIP for sample app" into ics-mr1
* commit '6ea11c0a20db6b808b92cfa40ef7f916825cee5e':
  docs: Add 101 class on activity lifecycle including ZIP for sample app
2012-04-19 19:06:51 -07:00
Scott Main
67e988e0e9 Merge "docs: for AU basic training on fragments including ZIP for sample app" into ics-mr1 2012-04-19 19:05:09 -07:00
Scott Main
6ea11c0a20 Merge "docs: Add 101 class on activity lifecycle including ZIP for sample app" into ics-mr1 2012-04-19 19:04:51 -07:00
Scott Main
d9ee0d71f4 docs: for AU basic training on fragments
including ZIP for sample app

Change-Id: Ifacdf63cb85274b1ff7a389c563d325604c0b7fa
2012-04-19 18:58:03 -07:00
Scott Main
be2f4edd2c docs: Add 101 class on activity lifecycle
including ZIP for sample app

Change-Id: Id2659ebe15094dad10da4d9bdefed527984fccd9
2012-04-19 18:53:40 -07:00
Dirk Dougherty
69e67195fd am 2a73a218: Doc change: Add link target for developer video block.
* commit '2a73a2189b2a592727d2e698d7dc09a973ffa273':
  Doc change: Add link target for developer video block.
2012-04-19 18:15:50 -07:00
Dirk Dougherty
2a73a2189b Doc change: Add link target for developer video block.
Change-Id: I24cd78a5c76029e9bf9425775d82944322c60f63
2012-04-19 18:11:09 -07:00
Dirk Dougherty
7367ebc8b6 am 3e6b20be: Doc change: update links to developer video.
* commit '3e6b20be5c7e05b85947e40f2099189ef9b5bf79':
  Doc change: update links to developer video.
2012-04-19 17:24:18 -07:00
Dirk Dougherty
3e6b20be5c Doc change: update links to developer video.
Change-Id: I8c12f7b144308f53ba687713084d56ed14b3ac45
2012-04-19 17:10:10 -07:00
John Grossman
be02f32cff TimedAudioTrack: Optimize the queue trim operation.
DO NOT MERGE
this change must be hand-merged into master due to directory
restructuring.

Don't perform the end PTS calculation for each buffer during trimming.
Instead, only calculate the ending PTS of a buffer if there is no next
buffer in the queue.  This optimization assumes that the buffers being
queued are in monotonic media time order (a fair assumption for now)
and that the timestamps in the audio are contiguous (not a requirement
for this API, but a reality of how it is being used right now).

In the case where the audio is discontinuous on purpose, it is
that this optimization will cause the system hold one extra buffer
which it could have safely trimmed.  It should not be much of an issue
since in real life the audio is almost always contiguous, and as long
as the media clock is running and the mixer is mixing, the buffer will
be used up and discard as part of the normal flow anyway.

Change-Id: I00061e85ee7d5651fcf80751646c7d7415894a14
Signed-off-by: John Grossman <johngro@google.com>
2012-04-19 12:21:20 -07:00
John Grossman
f609b661a6 TimedAudioTrack: Fix continuity threshold handling.
DO NOT MERGE
this change must be hand-merged into master due to directory
restructuring.

Fix issues with continuity threshold handling; notably
+ If the steady-state continuity threshold is exceeded, be sure to
  clear the on-time flag.  Failure to do this will result in the
  system picking a new mix point which simply satisfies the
  steady-state continuity threshold instead of the startup threshold.
  Since we are putting a discontinuity in presentation anyway, we
  really want to pick a perfect point, not just an OK point.
+ Tighten the steady-state continuity threshold.  It was currently set
  to 100mSec which is enormous.  4mSec (the new setting) is much more
  appropriate.  On systems with a VCXO (like tungsten) this should
  never be wrong by more than a sample.  If TimedAudioTracks are ever
  to be used on VCXO-less systems, this threshold should probably be a
  a parameter configurable by applications on a track by track basis
  so they can make the tradeoff between allowed error and frequency of
  disruptive corrections.
+ Reset the on-time flag if the mixer provides no PTS during a mix
  operation.  This makes for a convenient way for the HAL to reset
  timed tracks when it makes changes for delay compensation across
  multiple outputs.

Change-Id: I2cb23de5a3d1f75618abc1c8ab903db883837aa8
Signed-off-by: John Grossman <johngro@google.com>
2012-04-19 12:21:02 -07:00
Dirk Dougherty
aa0c94fc87 am 93a333e3: Doc change: Add summary page of Android Developers Live videos.
* commit '93a333e32646778cd96265783e531dddd046367c':
  Doc change: Add summary page of Android Developers Live videos.
2012-04-19 12:00:51 -07:00
Dirk Dougherty
93a333e326 Doc change: Add summary page of Android Developers Live videos.
Change-Id: I650471562dd0d50496cbff2178b19b7896565d93
2012-04-19 11:26:06 -07:00
Joe Malin
787fa9dc69 am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit '20176edc4ff43f10ab3be03d84bb9f02b7859bdb':
  DOC CHANGE: Add javadoc to ClipboardManager
2012-04-19 10:10:18 -07:00