Commit Graph

3446 Commits

Author SHA1 Message Date
RoboErik
583f08d2d6 am 351ab57e: am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev
* commit '351ab57e2538bbe98455661517bd0e4b7f104605':
  Delay calling onConnected until a session is set in MediaBrowser
2014-11-25 18:50:28 +00:00
Jean-Michel Trivi
17bee9ca7d am e19bb5c0: am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev
* commit 'e19bb5c092309fad108e556e2e76ab13c0c17786':
  Add support for audio focus locking
2014-11-25 17:55:48 +00:00
RoboErik
d9bb296b56 Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 2014-11-24 23:04:59 +00:00
RoboErik
d64c425f32 Delay calling onConnected until a session is set in MediaBrowser
This will delay all calls to onConnected from the MediaBrowserService
until a session token has been set. This also requires making it an
exception to try setting the session twice.

bug:18052336
Change-Id: Iecf186c53364183e1696af83a855c8db3294a5d0
2014-11-24 12:35:20 -08:00
Jean-Michel Trivi
958876fe55 Add support for audio focus locking
New API for a registered AudioPolicy to lock/unlock the audio
  focus stack and prevent any new grant of focus, similar to
  the way phone calls behave.

Bug 16010554

Change-Id: If34a58ca9bd43d5479e94a2a7b540750b4c6efe9
2014-11-24 10:46:12 -08:00
Lajos Molnar
7d612f0deb am 0b10f9c0: am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
* commit '0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb':
  media: fix isSupportedFormat for integer frame rate
2014-11-24 18:12:56 +00:00
Jean-Michel Trivi
29e12f25d8 am c229c393: am 09ff9125: Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev automerge: 14b9092
* commit 'c229c3935c2b3b3ccee459d84b81d9c84ac8b3ca':
  Convert record channel mask for dynamic mix
2014-11-21 02:58:20 +00:00
Jae Seo
9581094970 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev
automerge: cfaac8d

* commit 'cfaac8d1549430cc89e704602504413a5d59352c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
2014-11-21 02:21:15 +00:00
Jae Seo
d97dc701ba am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev
automerge: 7d97be9

* commit '7d97be9dbc8c220fa56e3665deb9b978a12ed71a':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
2014-11-21 01:59:00 +00:00
RoboErik
24228295e2 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev
automerge: bbf0f66

* commit 'bbf0f662a8a54e6c8c49a58b7a7273fe8756ff45':
  Handle volume events on master volume devices correctly
2014-11-21 01:49:48 +00:00
RoboErik
fdc7f747f2 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev
automerge: 216c089

* commit '216c089834e92733055a17bcade7ca1971677b49':
  Scale bitmaps in metadata sent to the system
2014-11-21 01:48:44 +00:00
Lajos Molnar
a4fcb62a22 media: fix isSupportedFormat for integer frame rate
Bug: 18473065
Change-Id: I670cc043d3cb117c26921cb639ff9eecc8f14b0a
2014-11-20 16:17:43 -08:00
Jean-Michel Trivi
09ff91255e Merge "Convert record channel mask for dynamic mix" into lmp-mr1-dev 2014-11-20 22:02:15 +00:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
2014-11-20 12:53:23 -08:00
Jae Seo
f66f3052a7 Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 2014-11-20 19:03:03 +00:00
Jae Seo
52bfa3328f Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 2014-11-20 18:52:16 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
RoboErik
b9c87fb403 Scale bitmaps in metadata sent to the system
This scales down any MediaMetadata bitmaps that are sent to the system
through MediaSession.

bug:18114918
bug:18084448
Change-Id: Ib7b040cd8245108ad2dd56afe2499290d2b49f51
2014-11-19 17:27:43 -08:00
Dongwon Kang
5f3cb4a584 TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
Background: because the hole-punching code lives only in SurfaceView,
the overlay view can be covered by the application if the TV input
changes the position of SurfaceView via Session.layoutSurface().
This change punches a hole as large as TvView so that the underlying
overlayview can be shown properly.

Bug: 18420642
Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
2014-11-19 20:27:55 +09:00
Jae Seo
8923735f28 am e0177a28: am 59f79d9b: am 3a9a53cb: Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev
* commit 'e0177a28a342bac14edfc4dc502603b886eea193':
  TIF: make the tune request handling more efficient
2014-11-18 20:21:55 +00:00
John Spurlock
1b9057169e am 3e846cb5: am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev
* commit '3e846cb53c6f6983e5309a4a8d5a1b54a1ac3d7c':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
2014-11-18 20:21:45 +00:00
RoboErik
519c7744b5 Handle volume events on master volume devices correctly
We weren't passing volume events to the master volume correctly on
devices that only use a master volume. This fix checks if the device
only has a master volume and adjusts the master volume instead of the
stream's volume if that's the case.

bug:18305790
Change-Id: Iec35e0a7dc59e6d73c9dfc88da324660bb15b1f3
2014-11-18 11:00:34 -08:00
Jae Seo
3a9a53cb75 Merge "TIF: make the tune request handling more efficient" into lmp-mr1-dev 2014-11-18 18:01:47 +00:00
John Spurlock
95ef08b348 Volume: Don't allow ringer volume of 0 exiting ringer mode.
For any device with vibration, not only voice-capable devices.

Bug: 18423530
Change-Id: I0f1a7df884d675e6bc6854dcf044426c07f3d2f7
2014-11-18 10:51:39 -05:00
Dongwon Kang
c918172508 TIF: make the tune request handling more efficient
- Clear the pending tune operations to handle consecutive tune requests
  efficiently.
- Add time out for onTune() to make developers not to handle whole tune
  process in the onTune() method.

Bug: 18179595
Change-Id: I571e55b78d7c4d17c7237c5ce70203941bec2130
2014-11-18 15:49:08 +09:00
Jeff Sharkey
afc506c54b am 670cf5c6: am 22c3f906: am 628d2606: Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev
* commit '670cf5c663f4f17faafa9d4f7cf7209f68a02468':
  Move ringtone redirection to MediaPlayer.
2014-11-14 19:16:38 +00:00
Jean-Michel Trivi
f46501680d am 3c922dd7: am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev
* commit '3c922dd7f2c82ae09c5ccf5a7b3a338ef682fe65':
  Support for delayed audio focus
2014-11-14 00:45:45 +00:00
Jeff Sharkey
628d2606f7 Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev 2014-11-13 22:16:15 +00:00
Jeff Sharkey
3b566b8470 Move ringtone redirection to MediaPlayer.
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.

With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.

To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.

Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
2014-11-13 13:52:41 -08:00
Jean-Michel Trivi
136f54153e Merge "Support for delayed audio focus" into lmp-mr1-dev 2014-11-13 18:47:34 +00:00
Wonsik Kim
90e733385d TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
Bug: 18283466
Change-Id: Ibb5d45c02a327e0b3e837ad3ec3603fa1623ff7b
2014-11-12 05:45:03 +00:00
Jean-Michel Trivi
fd6ad747e6 Support for delayed audio focus
New internal API for an audio focus requester to always enter
 the audio focus stack even if audio focus can't be granted
 immediately (e.g. during a phone call).
Remap the "no delay" interface to the new "requestAudioFocus"
 method signature and AIDL.

Bug 16010554

Change-Id: Iff91ddb0beb411cca1f8cf98300a9afc4178dc7f
2014-11-11 17:07:45 -08:00
Chong Zhang
bc0636e560 am 7b1c33f7: am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev automerge: 6610985
* commit '7b1c33f7a498b954d4c098e9f1a367b2be395d83':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
2014-11-11 18:55:35 +00:00
Chong Zhang
00795e9edd Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 2014-11-11 18:33:21 +00:00
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
2014-11-10 19:32:28 -08:00
Jason Parks
05e095ae08 am e8d0fe98: am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
* commit 'e8d0fe98a6d39c545467f679f0000b500ec7d341':
  Fix NPE for CTS.
2014-11-07 04:12:06 +00:00
RoboErik
c4a4636cc2 am fcfe6f5c: am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1
* commit 'fcfe6f5c7e12548d20c31bcad4db5089d23b78d8':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
2014-11-07 03:55:49 +00:00
Jason Parks
220b65d21d am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev
* commit '94c3e3bfcfe8d91283560082c737cb62e8d06742':
  Fix NPE for CTS.
2014-11-07 00:05:47 +00:00
RoboErik
b1d52e1d20 Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
* changes:
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
2014-11-06 21:20:19 +00:00
Jason Parks
de709869ae Fix NPE for CTS.
The effect list can be empty and will return null
from native code. This fixes the CTS crash.

Bug: 18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
2014-11-06 14:08:52 -06:00
RoboErik
a13846ddf3 Update metadata artwork and uri docs
This updates the Javadoc on the bitmap and uri fields to strongly
suggest Uris be used for high res artwork and strongly suggest Uris
use the content: style and support EXTRA_SIZE.

Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e
2014-11-06 10:55:06 -08:00
Jeff Tinker
9e522f3432 am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '0d8d6ba807078b70eae53e676443ef5ac7598560':
  Add missing secure stop methods
2014-11-06 02:54:57 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
RoboErik
3e0cfcda31 skip MediaController callbacks if it's been unregistered
This gives slightly better gaurantees around when an app will receive
a callback. As long as they remove a callback on the same thread calls
get posted on they won't receive any callbacks after the remove.

bug:18104724
Change-Id: Id9878186f005bf0b35c0380cd35f8fd7e67d1d90
2014-11-05 13:07:38 -08:00
Andrew Solovay
b442823288 am cf6e9c22: am 4f0850a1: am fbc3bdec: am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge: 8d7d7b4
* commit 'cf6e9c2213e0d36a6ab62957e2ac6eb0f3a75dd0':
  docs: Removed broken link to non-existent method.
2014-11-05 20:53:07 +00:00
Andrew Solovay
fbc3bdec7a am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
automerge: 8d7d7b4

* commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
  docs: Removed broken link to non-existent method.
2014-11-05 20:22:24 +00:00
RoboErik
341dd2bda5 am 5468f292: am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev
* commit '5468f292f31383ba1ea9b488e1d0dfc743764f47':
  Post volume requests to the handler thread in MediaSession
2014-11-05 19:01:45 +00:00
RoboErik
305563bd63 am 6651cd38: am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
* commit '6651cd38307d516f5c8e322828b7aaa076231071':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
2014-11-05 19:01:40 +00:00
Andrew Solovay
8d7d7b448f am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
* commit '56576838a8e8c4f44f8df13cc40295a918540b86':
  docs: Removed broken link to non-existent method.
2014-11-05 18:52:27 +00:00
RoboErik
9af44ddf03 Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 2014-11-05 18:29:32 +00:00