3218 Commits

Author SHA1 Message Date
Lajos Molnar
39e977834d am f152b6e5: am 482a07d7: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev
* commit 'f152b6e557a785eeca19041001167b1dba34f08d':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
2014-09-10 07:22:57 +00:00
Robert Shih
c434010e30 am b840ec70: am 8bad28ef: am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start
* commit 'b840ec70c54672c8435f67f93b6fc03156208098':
  MediaPlayer/SubtitleController:fix add/select timed text on start
2014-09-10 07:22:48 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Robert Shih
8c4d53c3a9 MediaPlayer/SubtitleController:fix add/select timed text on start
- scan internal tracks when necessary
 - fix overflow in addTimedTextSource
 - do not hide timed text track in doSelectDefaultTrack; i.e. apply
   hiding logic to subtitle tracks only
 - do not notify stop in scheduleUpdate; it will be fired in onStopped
   if necessary

Bug: 17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
2014-09-10 01:33:17 +00:00
Jeff Tinker
02fe289de9 am 52b59f6c: am 6a884aad: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev
* commit '52b59f6cb7155bf21abff70d25f0751a3f101830':
  Add support for max-res decode
2014-09-10 01:10:08 +00:00
Lajos Molnar
5498ba4a1f am 55b5fb8e: am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
* commit '55b5fb8e25f0ef15377c08db9c1ec82e03482e18':
  initialize codec list before MediaCodec.getCodecInfo()
2014-09-10 01:07:54 +00:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
2014-09-09 17:27:26 -07:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Lajos Molnar
aa79d99576 initialize codec list before MediaCodec.getCodecInfo()
Bug: 17374217
Change-Id: I8e8fc3a34ec01afdf5fc577979010183971c878b
2014-09-09 14:35:33 -07:00
Jason Monk
ce0bd0b745 am c8b3d218: am a03fb8a1: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev
* commit 'c8b3d218f764b19dbe00d82d552304f4f9e07408':
  Add user-specific playSoundEffect and use in NavBar
2014-09-09 18:31:28 +00:00
Jae Seo
c44c64e824 am 9ae2fd2f: am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev
* commit '9ae2fd2fe828b740a0ca399c7973fe16359bbbcd':
  Add Japanese content ratings
2014-09-09 18:08:26 +00:00
Jason Monk
9580f6c6cb Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 2014-09-09 18:03:14 +00:00
Jae Seo
fe5998b5ad Add Japanese content ratings
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
2014-09-09 10:06:52 -07:00
Eric Laurent
984f270153 am 2a9021fd: am daafb999: am 602e21fa: Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev
* commit '2a9021fd95c82b676dd504bf67fbb18db8269b9b':
  unhide AudioAttributes flag FLAG_HW_AV_SYNC
2014-09-09 05:29:17 +00:00
Eric Laurent
7c36c86342 Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 2014-09-09 01:59:00 +00:00
Eric Laurent
56340fc2e8 unhide AudioAttributes flag FLAG_HW_AV_SYNC
Bug: 17112525.
Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
2014-09-08 18:51:35 -07:00
RoboErik
4dfedcb0c3 am 0e6071ec: am c1ec88a5: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev
* commit '0e6071ec37b667d2c0af20522e312e07256e88ce':
  Possible fix for dead handler in Music button event sending
2014-09-08 23:14:54 +00:00
RoboErik
9ff7dda93e Possible fix for dead handler in Music button event sending
I'm still attempting to root cause, but this is a potential fix. I
suspect the callback is getting registerd on a looper that isn't the
main looper which is then getting killed at some point. This change
will make all legacy callbacks happen on the main looper, which should
prevent the state.

bug:17420281
Change-Id: Ia78e694b32b24398d3c09f49d12632755ef45597
2014-09-08 13:11:55 -07:00
Jason Monk
0c37ba3188 Add user-specific playSoundEffect and use in NavBar
Add a hidden version of playSoundEffect that takes a userId to
get the correct setting as to whether sound effects should play
or not.

Bug: 15106706
Change-Id: I5c0b74081fd00732a43fe42a76d33d05197333d0
2014-09-08 15:34:23 -04:00
Jae Seo
6f74a2ab6c am 57091aef: am 067d3da5: am 8f2f5184: Merge "TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable" into lmp-dev
* commit '57091aeffee9742e8bec807d6b966d4200cfdaf6':
  TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable
2014-09-07 21:10:50 +00:00
Jae Seo
d254611778 TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable
TV input services are now required to call these methods to
unblock/block the screen.

Bug: 17364845
Change-Id: Ifb435900d7f61785198dba2e255a2d24dbf44dc6
2014-09-07 13:39:17 -07:00
Jean-Michel Trivi
cd2278f7f3 am 56acac5d: am 81cbf021: am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev
* commit '56acac5da324ca43a9ec2c81f41a57540cd5efb7':
  Respect Android conventions in AudioManager extras
2014-09-06 00:05:35 +00:00
Jean-Michel Trivi
3461586662 am f2188810: am 959b735f: am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev
* commit 'f2188810c51482fcc292e5d8dcb4afa714ef5b52':
  AudioAttributes: unhide CREATOR
2014-09-06 00:05:29 +00:00
Jean-Michel Trivi
afd899c61f Merge "Respect Android conventions in AudioManager extras" into lmp-dev 2014-09-05 23:37:10 +00:00
Jean-Michel Trivi
2caa0a6070 Merge "AudioAttributes: unhide CREATOR" into lmp-dev 2014-09-05 23:36:44 +00:00
Lajos Molnar
9092ed6c65 am 7b5bcc68: am 89315051: am 00352e1e: Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev
* commit '7b5bcc68fd16be733a557931d78829c3ab9ce7ea':
  MediaCodecInfo: allow getting info for secure codec
2014-09-05 23:32:31 +00:00
Lajos Molnar
e51ca9c528 am 06c79c39: am 66522343: am fd03c56c: Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev
* commit '06c79c39e80e4f8d5d6e1989b80b1fb2926ea59c':
  MediaCodecInfo: rename createFromProfileLevel
2014-09-05 23:32:27 +00:00
Lajos Molnar
cfc102685c Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 2014-09-05 23:09:33 +00:00
Lajos Molnar
b860155de1 Merge "MediaCodecInfo: rename createFromProfileLevel" into lmp-dev 2014-09-05 23:08:25 +00:00
Jean-Michel Trivi
deddda5d62 Respect Android conventions in AudioManager extras
Update the value of the extras in android.media.AudioManager
  used in ACTION_HDMI_AUDIO_PLUG to respect the Android
  naming conventions.

Bug 17390818

Change-Id: Ied1830e0ffa3b1fa7235d0675f36f2f43aac554d
2014-09-05 15:55:32 -07:00
Jean-Michel Trivi
8aacb2e96c AudioAttributes: unhide CREATOR
android.media.AudioAttributes implements the Parcelable interface,
 and is part of the SDK, it therefore requires CREATOR, writeToParcel,
 and describeContents to be "unhidden".
CREATOR was still @hide

Bug 17390818

Change-Id: I9c1cb1d454fe538cb5be6066ebed290a99352da9
2014-09-05 22:30:36 +00:00
Jae Seo
4ac04f1034 am 4a22cb2b: am f550dd4d: am caf3c12c: Merge "API review: android.media.tv" into lmp-dev
* commit '4a22cb2b2b0c48f57777e48dfc2462fb6ce2f72a':
  API review: android.media.tv
2014-09-05 22:09:58 +00:00
RoboErik
d6bd213edc am e23b2ca8: am 8466b902: am 509d0b4e: Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev
* commit 'e23b2ca8048927dc88aea2f2d832a50b7cbb8e06':
  send volume button events to adjustSuggestedStream instead of adjustStream
2014-09-05 21:32:53 +00:00
RoboErik
b59eacf5fe resolved conflicts for merge of a41f48f8 to master
Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
2014-09-05 14:29:31 -07:00
Jae Seo
7492a4c1f4 Merge "API review: android.media.tv" into lmp-dev 2014-09-05 21:00:26 +00:00
Jae Seo
2778f5a7bd API review: android.media.tv
TvInputInfo
- Renamed getIntentForSettingsActivity to createSettingsIntent.
- Renamed getIntentForSetupActivity to createSetupIntent.
- Changed the value of EXTRA_INPUT_ID from inputId to
  android.media.tv.extra.INPUT_ID.
- Removed @hiden from CREATOR.

TvInputManager
- Renamed TvInputListener to TvInputCallback.
- Renamed registerListener to registerCallback.
- Renamed unregisterListener to unregisterCallback.
- Changed the value of ACTION_BLOCKED_RATINGS_CHANGED from
  android.media.tv.TvInputManager.ACTION_BLOCKED_RATINGS_CHANGED
  to android.media.tv.action.BLOCKED_RATINGS_CHANGED.
- Changed the value of ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED from
  android.media.tv.TvInputManager.ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED
  to android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED.
- Changed the value of ACTION_QUERY_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.ACTION_QUERY_CONTENT_RATING_SYSTEMS
  to android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS.
- Changed the value of META_DATA_CONTENT_RATING_SYSTEMS from
  android.media.tv.TvInputManager.META_DATA_CONTENT_RATING_SYSTEMS
  to android.media.tv.metadata.CONTENT_RATING_SYSTEMS.

TvView
- Renamed TvInputListener to TvInputCallback.
- Renamed setTvInputListener to setCallback.

Bug: 17389538
Change-Id: I3dceee3db67862d77b183aef0da4fd3a8681ab1b
2014-09-05 13:43:27 -07:00
RoboErik
7d0db3c364 am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev
* commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6':
  rename add/removeCallback to register/unregisterCallback
2014-09-05 20:32:32 +00:00
RoboErik
88d98d3aab am 8fe56085: am 8c47737f: am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev
* commit '8fe5608598eefe7213fb978cad77981011773a26':
  rename SERVICE_ACTION to SERVICE_INTERFACE
2014-09-05 20:32:22 +00:00
RoboErik
77a634503f Merge "send volume button events to adjustSuggestedStream instead of adjustStream" into lmp-dev 2014-09-05 19:49:56 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
RoboErik
272e161c1a send volume button events to adjustSuggestedStream instead of adjustStream
This way the audio system can route the adjustments correctly when a bt
headset is connected.

bug:17281977
Change-Id: Ic41d038e47179baffc86e539562da285446148c7
2014-09-05 12:37:39 -07:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
2014-09-05 11:40:34 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
2014-09-05 11:40:33 -07:00
Jean-Michel Trivi
f0384ee674 am 565f0114: am 4bb9033a: am 0bd1a9d7: Merge "Permission check for entering MODE_IN_CALL" into lmp-dev
* commit '565f01147b56bd6730a0fce8291894b4747ab9f7':
  Permission check for entering MODE_IN_CALL
2014-09-05 18:26:57 +00:00
Jean-Michel Trivi
3512bcd3af Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 2014-09-05 18:00:51 +00:00
Jean-Michel Trivi
ccd654e9d4 Permission check for entering MODE_IN_CALL
Make the ability to change the audio mode conditional to having
 the MODIFY_PHONE_STATE permission.
Make AudioService's internal implementation of the mode setting
 (the setModeInt() method) private, it is only meant to be used
 by AudioService.
Refer to the permission names through Manifest.permission, not
 by their string value.

Bug 14964198

Change-Id: I49870207566e53d5c8764646cece06d8272f93ed
2014-09-05 09:50:54 -07:00
RoboErik
ec7aa9d9d1 am 8e5eca7d: am 41151329: am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev
* commit '8e5eca7db46654482c935aeaba2d0a1652ca739b':
  Ensure there's a valid handler when registering a sessions listener
2014-09-04 21:28:55 +00:00
Eric Laurent
d77d888eff am dd1215b0: am c61756c5: am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev
* commit 'dd1215b07c8391e0f3853be015df4029b6245224':
  AudioManager: only use main looper for AudioPort event handler
2014-09-04 21:28:49 +00:00