6972 Commits

Author SHA1 Message Date
Jean-Michel Trivi
74e56f1929 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 2013-04-15 17:13:46 +00:00
Andreas Huber
e813a85c97 am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev
* commit '2de0771da2b6c07f717d62ae4e4be93702af9a43':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
2013-04-15 08:34:37 -07:00
Andreas Huber
baf4a057f8 am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev
* commit '5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
2013-04-15 08:34:34 -07:00
Andreas Huber
2de0771da2 Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 2013-04-15 15:16:27 +00:00
Jean-Michel Trivi
9157477300 Public APIs for media position in RemoteControlClient
New APIs in android.media.RemoteControlClient to support application
 exposing their current media playback position and speed, and
 let the framework request position changes.

Bug 8120740

Change-Id: Ibfc41f60e279413c26147e3276d96f28b7f506e7
2013-04-14 12:17:56 -07:00
Jeff Tinker
d8bbfc2750 Clarify how release of offline keys is handled in the MediaDrm API
bug: 8603820

Change-Id: Ifeda018fbbbb9905e62ee242da2ede1ed89868a2
2013-04-12 09:57:43 -07:00
Andreas Huber
7cd281c332 Document that MediaPlayer.getDuration() returns an invalid value (-1)
if no duration information was available.

Change-Id: If064627cca7915f4562b6d61bfd4ceb9a3c9390c
related-to-bug: 8596285
2013-04-11 11:09:06 -07:00
Andreas Huber
a57da0dc5a MediaExtractor.setDataSource(...) has always thrown IOExceptions from
within jni code, but failed to document this fact. No more.

Change-Id: If55980616e974637209dea2b7a28b2481b55cea4
related-to-bug: 8470755
2013-04-11 10:54:55 -07:00
Adam Powell
66104e1e19 am 521eeaef: Merge "Make MediaRouter ignore remembered wifi displays when wifi display is off" into jb-mr2-dev
* commit '521eeaefcb4b78a8b571d1a1b4f095d993aea8b6':
  Make MediaRouter ignore remembered wifi displays when wifi display is off
2013-04-10 16:13:01 -07:00
Adam Powell
615e413a90 Make MediaRouter ignore remembered wifi displays when wifi display is off
Bug 8417329

Change-Id: Ica9bf1b250be4b72ba32e63d7eb1a6ff0b727961
2013-04-10 16:04:59 -07:00
Jean-Michel Trivi
bb15974b72 am 8515256a: Merge "Handle seek requests in AudioService" into jb-mr2-dev
* commit '8515256ad477721a97108745da4c86f378f50637':
  Handle seek requests in AudioService
2013-04-10 09:34:09 -07:00
Jean-Michel Trivi
8515256ad4 Merge "Handle seek requests in AudioService" into jb-mr2-dev 2013-04-10 16:29:18 +00:00
Ying Wang
a976bddd9c am d8b26d6c: Merge "Add liblog" into jb-mr2-dev
* commit 'd8b26d6c424741dd09cf70ee88fd237807aaf301':
  Add liblog
2013-04-09 22:28:51 -07:00
Ying Wang
d685894212 Add liblog
Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
2013-04-09 21:54:12 -07:00
Jean-Michel Trivi
3fbf67e217 Handle seek requests in AudioService
AudioService handles seek requests to RemoteControlClients.
Discard old or unprocessed seek requests when handling a new one.
Update javadoc for OnPlaybackPositionUpdateListener interface.

bug 8120740

Change-Id: Id17c2852b24d4b8af85e472a177484b98cfeba05
2013-04-09 14:37:26 -07:00
Marco Nelissen
d563cede5c am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev
* commit 'c4ad3cb07ed76c5697c60285456d9c49675174d9':
  Add support for common encryption
2013-04-08 16:42:17 -07:00
Marco Nelissen
c4ad3cb07e Merge "Add support for common encryption" into jb-mr2-dev 2013-04-08 23:39:29 +00:00
Marco Nelissen
e20a6d5c47 Add support for common encryption
Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
2013-04-08 14:32:34 -07:00
Dianne Hackborn
3793b92816 am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev
* commit 'bc948101043b3c4b57eb6e0e2421494fd7c1d41e':
  Have audio service clean up new receivers in crashing processes.
2013-04-08 13:20:02 -07:00
Dianne Hackborn
bc94810104 Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 2013-04-08 20:10:37 +00:00
Dianne Hackborn
79f7ec70eb Have audio service clean up new receivers in crashing processes.
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away.  These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.

Also added some additional cleanup of media button receivers
when packages change (updated, cleared).

And on top of that, a new "media" command for doing media
things.  Currently lets you send media keys and monitor
remote display data.

Oh and finally added a new BaseCommand base class for
implementing these command line utilities.

Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
2013-04-08 13:08:37 -07:00
ztenghui
34dd708a21 am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev
* commit '50b9eb1c7375a87525d44a036337a8ba18eba55b':
  Update the documentiation for MediaMuxer::writeSampleData()
2013-04-08 10:27:18 -07:00
ztenghui
50b9eb1c73 Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 2013-04-08 17:22:29 +00:00
Eric Laurent
1a39d1bff4 am e8d9d2b3: Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev
* commit 'e8d9d2b3352bdeba0a455666bda9eb64b75198f7':
  AudioService: do not use virtual call for bt sco
2013-04-05 15:29:46 -07:00
Eric Laurent
e8d9d2b335 Merge "AudioService: do not use virtual call for bt sco" into jb-mr2-dev 2013-04-05 22:14:13 +00:00
Eric Laurent
25fc29b369 AudioService: do not use virtual call for bt sco
Do not use startScoUsingVirtualVoiceCall() BluetoothHeadset
API to connect SCO audio. This will cause headsets to act as if an incoming
call was received which is not what we want for voice commands.

Bug 8157702

Change-Id: I271909d4d1f3822758740a8484e3d2d8b4f34c00
2013-04-05 14:27:13 -07:00
Glenn Kasten
90771cbaed am 564c866b: Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev
* commit '564c866bdfa0a415bfd34722767836add1517951':
  Fix AudioTrack.setPlaybackRate() error handling
2013-04-05 08:49:16 -07:00
Glenn Kasten
564c866bdf Merge "Fix AudioTrack.setPlaybackRate() error handling" into jb-mr2-dev 2013-04-05 15:45:15 +00:00
Jeff Tinker
72e2307c6a am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '1e0f36cffd8a4399fcd12e25bddde4544992bcb2':
  Implement async event callout from drm plugin to Java app
2013-04-04 18:23:10 -07:00
Jeff Tinker
1e0f36cffd Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev 2013-04-05 01:16:23 +00:00
Glenn Kasten
f19395db63 Fix AudioTrack.setPlaybackRate() error handling
CTS expects that setPlaybackRate() returns an error for a static buffer
AudioTrack that has not yet had any data written to the buffer.

Bug: 8181114
Change-Id: I17ba039368468f6ccd1eec5322018bfe420c09c8
2013-04-03 17:14:14 -07:00
Jean-Michel Trivi
ca762beea4 am 6a570204: Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev
* commit '6a5702041f48f868863a0454d7df6cd64eab235d':
  RemoteControlClient receives playback position change requests
2013-04-03 14:14:49 -07:00
Jean-Michel Trivi
6a5702041f Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev 2013-04-03 21:11:12 +00:00
Andreas Huber
9a1ff831b7 am c9a1ca3c: Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM"
* commit 'c9a1ca3c1a9f8591b675b980c1e390be8d901b39':
  MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM
2013-04-03 13:38:34 -07:00
ztenghui
f7d3aae328 Update the documentiation for MediaMuxer::writeSampleData()
Change-Id: I7a5591c7b14728c1833e6401dcd8f0272c4ee56c
2013-04-03 13:31:41 -07:00
Jeff Tinker
54cfbd6dc2 Implement async event callout from drm plugin to Java app
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
2013-04-03 12:01:59 -07:00
Andreas Huber
c9a1ca3c1a Merge "MediaCodec: docs: Clarify that audio/mp4a-latm is plain AAC, not in LATM" 2013-04-03 16:09:16 +00:00
Jeff Tinker
5c0ce512c5 Merge "MediaDrm API update" into jb-mr2-dev 2013-04-02 22:49:19 +00:00
Jean-Michel Trivi
c3c7b92a81 Merge "Clean up role of component name in media button event receiver" into jb-mr2-dev 2013-04-02 15:54:11 +00:00
Jeff Tinker
16b8cffb28 MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
2013-04-01 21:59:35 -07:00
Jeff Brown
579b0c091c Merge "Fix a doc typo." into jb-mr2-dev 2013-04-02 03:24:10 +00:00
Jeff Brown
24e22d19a2 Fix a doc typo.
Change-Id: Id41af7644e552b0fbfe90818d0a9f42178c6474d
2013-04-01 19:41:41 -07:00
Jean-Michel Trivi
3261b537c5 RemoteControlClient receives playback position change requests
RemoteControlClient defines two listener interfaces for playback
  position, one to let the framework query the current playback
  position, the other to request playback to seek to a given
  position.

Updated IRemoteControlDisplay interface to support passing info
  about whether the user of RemoteControlClient can provide a
  playback position, and receive a new one.
Updated implementations of IRemoteControlDisplay to new
  interface.

Bug 8120740

Change-Id: I1a5a969da4d0f8c9ad27f691919dd08f8653982b
2013-04-01 18:14:30 -07:00
Eric Laurent
742647c809 Merge "AudioService: removed last audible volume index" into jb-mr2-dev 2013-04-02 00:32:32 +00:00
Eric Laurent
42b041ed4f AudioService: removed last audible volume index
Removed storage of last audible stream volume index.
This information is redundant because we already have
two pieces of information (current volume and mute state)
allowing to completely define which volume should actually
be applied by the framework or indicated to apps.

The last audible index management had anyway been broken by
successive changes making that the value stored could be 0
in some cases causing problems like issue 8109149 when
restoring the volume settings from the DB.

Bug 8109149

Change-Id: Iea80f5a994554e42d45b227f651ec9646844aa77
2013-04-01 16:16:57 -07:00
Mike Lockwood
1341f1eee3 MTP: Implement date created field in GetObjectInfo
Bug: 8293874

Change-Id: I3e50ea1049f63e2ed3a1f849fef74a2fbf206fe8
2013-04-01 10:54:22 -07:00
Jean-Michel Trivi
b839b83c73 Clean up role of component name in media button event receiver
A public API was added to AudioManager to register a media button
 event receiver whithout having to supply a ComponentName.
This CL updates the comments that specified that the now optional
 ComponentName parameter can be null, and never persist the button
 event receiver is there is no ComponentName to persist.
Also unregistering the media button receiver makes no use of
 the ComponentName anymore.

Change-Id: Idcfed1e2a85feb6fa178ca7797427f238705957c
2013-03-30 14:17:45 -07:00
Jean-Michel Trivi
6f2683698e Fix RemoteControlStackEntry constructor in AudioService
Add missing call to constructor of RccPlaybackState to initialize
 the mPlaybackState field of the RemoteControlStackEntry class.

bug 8512601

Change-Id: I636d5c1b416d6a3d3808d5be53c9c544ab293732
2013-03-30 12:35:51 -07:00
kmccormick
be1339edc4 am 328f7b71: am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '328f7b7160d4c5a30c6810cbcd4aa01bb7b57dda':
  Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:04:09 -07:00
kmccormick
328f7b7160 am 90fa2ae2: am 23b55e78: am 3fab60bd: am 183c95e0: Merge "Doc update: PlaybackCompleted valid state 4 pause" into jb-mr1.1-docs
* commit '90fa2ae28c200e0269f86f7d4e486ce781763a99':
  Doc update: PlaybackCompleted valid state 4 pause
2013-03-29 16:02:30 -07:00