Commit Graph

3411 Commits

Author SHA1 Message Date
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
RoboErik
5604a85ac6 Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
2014-11-05 18:26:00 +00:00
RoboErik
131e63adaa Add extras to the PlaybackState
This allows apps to include extras that are atomic with play state
changes.

bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
2014-11-04 13:47:45 -08:00
RoboErik
566c1ed18f Add setRatingType to MediaSession
This was missing in L. Needed to tell controllers how to rate content.

bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
2014-11-04 13:14:19 -08:00
Eric Laurent
daccecb263 am d9764f1c: am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev
* commit 'd9764f1c233a3106ce11c4c48fb93b020a1061d4':
  AudioService: fix wired headset insertion delay.
2014-11-04 17:15:55 +00:00
Eric Laurent
fe91d4e6a2 Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 2014-11-04 17:02:25 +00:00
Dongwon Kang
8f018e361b am 89ff8726: am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b
* commit '89ff8726545e9cced824c655c8e46d1e8f82aa5e':
  TIF: Fix a typo and remove an unused method in TvInputService
2014-11-04 03:28:22 +00:00
Eric Laurent
1a14ec04e3 am 12f6a11d: am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f
* commit '12f6a11de637406a066c532a07f9d4466a652af0':
  AudioService: fix cross deadlock
2014-11-04 03:28:16 +00:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Eric Laurent
adbe8bf85f AudioService: fix wired headset insertion delay.
Do not systematically delay a device connection
message by 1 second if another message is still in the queue
but calculate delay based on last message insertion time.

Bug: 17882912.

Change-Id: Id86c338488f41eebfa1dfd926032468be0294cec
2014-11-03 18:26:57 -08:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
2014-11-03 17:30:41 -08:00
Andrew Solovay
4034546812 docs: Removed broken link to non-existent method.
Doc had included link to method MediaBrowserService.onLoadIcon().
Per bug http://b/17205016 that method was removed before release.

Revised doc is staged to:

http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html

(Note that the other "See Also" link, which I didn't remove, is badly
formatted because Javadoc seems to choke on links to methods that are
passed generic types. JoeFernandez@, if you can suggest a better way
to format that link I'll make that change too.)

bug: 18229650
Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
2014-11-04 01:25:26 +00:00
Jeff Tinker
1b51c72e91 Add missing secure stop methods
b/18053197
b/18076411

Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
2014-11-03 16:22:04 -08:00
Dongwon Kang
79d2b4c810 TIF: Fix a typo and remove an unused method in TvInputService
Change-Id: I2c0233678c08a7070ffe507d9671e1ab669fdfd8
2014-11-03 16:04:12 +09:00
Dongwon Kang
6dd6aac9ef am 099003bd: am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program
* commit '099003bd20108ee5f2c5cdd00b78fc1779385714':
  TIF: Add more documentation on start/end time of TvContract.Program
2014-11-03 04:23:57 +00:00
Dongwon Kang
4dd56c93e3 TIF: Add more documentation on start/end time of TvContract.Program
Bug: 18163685
Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f
2014-11-03 10:58:00 +09:00
Jean-Michel Trivi
34e62423f1 am 9e0fc95d: am 38b00a63: Merge "More AudioPolicy registration" into lmp-mr1-dev automerge: 5a51050
* commit '9e0fc95d08652acaa4ab853917729922c40a734b':
  More AudioPolicy registration
2014-10-31 16:50:10 +00:00
Jean-Michel Trivi
38b00a63c9 Merge "More AudioPolicy registration" into lmp-mr1-dev 2014-10-31 16:32:53 +00:00
Dongwon Kang
b6f66b4055 am c86090ea: am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d
* commit 'c86090ea0ca6c9deaecd366d183d98ded71bd25b':
  TIF: handle inputs holding the overlay view even after the session release
2014-10-31 00:25:56 +00:00
Dongwon Kang
7c1f55e6d3 am 27219325: am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev
* commit '27219325d5e83ad4c63ba3424fd99b24456b558a':
  TIF: Handle notifyXXX() calls requested before the session initialization
2014-10-31 00:25:51 +00:00
Jean-Michel Trivi
8fdb0d4def More AudioPolicy registration
Define new usage in AudioAttributes to describe "virtual" sources.
Maintain a registration string in AudioPolicy and AudioMix that
 is used for the address of the mix in the native policy manager.
AudioPolicy registration marks the audio policy configuration and
 the audio mixes as registered.
The AudioPolicy class is used as the factory for the AudioTrack
 and AudioRecord objects that are respectively used as the
 source and sink of the mixes created by the policy owner.

Bug 16009464

Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
2014-10-30 17:22:34 -07:00
Andre Eisenbach
8d9a4da729 am 1bf7bca5: am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
* commit '1bf7bca511e3fdbb5e71bb71158d56400538b910':
  Fix exception in AudioService when no BT Headset is connected.
2014-10-30 23:59:39 +00:00
Dongwon Kang
ce34c6d308 TIF: handle inputs holding the overlay view even after the session release
Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
2014-10-30 13:37:03 +09:00
Dongwon Kang
c1f26faa2d Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 2014-10-30 04:32:30 +00:00
Dongwon Kang
3eefa59e37 TIF: Handle notifyXXX() calls requested before the session initialization
Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.

Bug: 17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
2014-10-30 09:34:56 +09:00
Andre Eisenbach
570cc5302a Fix exception in AudioService when no BT Headset is connected.
If AudioManager.startBluetoothSco() is invoked with no Bluetooth Headset
connected, a NullPointerException will ensue.

Added check to make sure mBluetoothHeadsetDevice is set before accessing
it.

Bug: 17601845
Change-Id: Ia00bfffbea5484230b11a74787fe3309c18f824d
2014-10-29 09:56:41 -07:00
RoboErik
563acea666 Post volume requests to the handler thread in MediaSession
Volume requests should be getting sent on the same thread as other
callbacks, not on the binder thread.

bug:18156755
Change-Id: I35bceb3f8c74ccba35f3d08ff000a254fcbd04bb
2014-10-28 13:26:26 -07:00
Lajos Molnar
53f1c8ba28 am 2577b3c0: Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge: aab38b7 automerge: e4c7a65
* commit '2577b3c0d82fc24ff9ae586ea4e976442be7c21e':
  MediaCodec/Image: handle null cropRect correctly
2014-10-28 07:17:48 +00:00
Mike Lockwood
e889c8e393 am bfdc6b50: Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5 automerge: 9f08a9f
* commit 'bfdc6b50f49d6b0f352d0a8c0d63bbde0c6038e8':
  Improve toString() methods for audio classes to help with debugging
2014-10-28 07:16:42 +00:00
Eric Laurent
972c42e34a am 4ec1d430: am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev automerge: af93061
* commit '4ec1d430db6c9b564d9b78e3654507594e9dce8c':
  audioservice: fix default stream volume
2014-10-28 07:16:21 +00:00
Lajos Molnar
5ea17442c5 MediaCodec/Image: handle null cropRect correctly
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
2014-10-27 14:58:26 -07:00
Mike Lockwood
ac7d8c5cc8 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 2014-10-27 21:10:22 +00:00
Mike Lockwood
07cd124b09 Improve toString() methods for audio classes to help with debugging
bug: 18139399

Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
2014-10-27 14:07:35 -07:00
Eric Laurent
670a82cbb1 Merge "audioservice: fix default stream volume" into lmp-mr1-dev 2014-10-27 19:40:30 +00:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
2014-10-27 10:13:00 -07:00