5541 Commits

Author SHA1 Message Date
Jaewan Kim
5bdb4e0583 Add oneway keyword for the IOnMediaKeyListener
Test: Tested manually
Change-Id: I35406ff6688b7529873e246226a9617244b4f391
2017-02-06 22:07:24 +09:00
Andy Hung
763aeb5b94 Merge "AudioTrack: Enable deep buffer under certain conditions" 2017-02-04 01:43:13 +00:00
Dongwon Kang
2c3c4036d5 TIF: use @StringDef annotations in TvContract
Test: build
Bug: 34949964
Change-Id: I59ec8ff245f36a1981a012349892114fe26d5265
2017-02-03 13:19:14 -08:00
Andy Hung
9025cc090b AudioTrack: Enable deep buffer under certain conditions
Under certain conditions, i.e. USAGE_MEDIA and
CONTENT_TYPE UNKNOWN, MUSIC, MOVIE and large buffers
we route the AudioTrack to deep buffer to save power.

Change-Id: Ibc8a31750999da842e36156f939448989ee50511
Test: Play Movies, CTS
Bug: 30687201
2017-02-03 09:18:34 -08:00
TreeHugger Robot
ec3211830e Merge "TIF: add COLUMN_SYSTEM_APPROVED in Channels" 2017-02-02 22:54:44 +00:00
TreeHugger Robot
39455174d7 Merge "TIF: change the column names to be consistent with other fields" 2017-02-02 22:54:00 +00:00
Hangyu Kuang
48a3cb6984 Merge "media: Add 3gpp output format to MediaMuxer." 2017-02-02 18:07:22 +00:00
Dongwon Kang
eedc4b5b7d TIF: change the column names to be consistent with other fields
1. Add _MILLIS for time related columns.
2. Remove PREVIEW_ prefix.
(COLUMN_PREVIEW_VIDEO_URI is an exception since the meaning is not
clear without it.)
3. Add _URI for COLUMN_LOGO

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 34806184
Change-Id: I1c75b0402508911a37491c7712f12574e574fb9b
2017-02-01 16:13:26 -08:00
Hangyu Kuang
03299f9c8e media: Add 3gpp output format to MediaMuxer.
Test: CTS test.
Bug: 34281643
Change-Id: I45b65728aa1fbde7cee88ca41d7f1bd692fc866c
2017-02-01 15:44:49 -08:00
Jean-Michel Trivi
6deaa4c8cf Merge "Notification playback synchronized with audio focus" 2017-02-01 18:43:36 +00:00
Dongwon Kang
72529d0fa7 TIF: add COLUMN_SYSTEM_APPROVED in Channels
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 34679597
Change-Id: I271e37ae89b2b7f64ab3ba2fdd2cc363f7c98764
2017-01-31 18:07:31 -08:00
Jean-Michel Trivi
99489ccf74 Notification playback synchronized with audio focus
PlayerProxy: more control options (pan, delayed start),
  remove exceptions in method signatures.
Use delayed start on notification playback for better sync
  between media apps and notifications
Disabled for now: support for AudioService (through
  MediaFocusControl and PlaybackActivityMonitor) to enforce
  audio ducking of focus owners losing audio focus with
  AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK, and who don't
  play audio that has a content labelled as CONTENT_TYPE_SPEECH.
  This feature will be enabled when setting a VolumeShaper
  on a player works.

Test: play music and play notification
Bug 30258418

Change-Id: I4e4d911645306bbde17f74288f3b61781fe0e3fe
2017-01-31 15:40:09 -08:00
Edwin Wong
e9b8348027 Merge "Pass application packagename to drm plugin." 2017-01-31 05:03:44 +00:00
Hassan Shojania
0b52e95c3f Modular DRM for MediaPlayer
Bug:  34559906
Test: Manual through the test app

Change-Id: If76e2898e6064c5661193872b907b1720838c678
2017-01-27 19:03:09 -08:00
Ray Essick
0e0fee1e3a API access to mediametrics
provide SDK/API access to media metrics for user apps. This lets the
apps metrics data for their instances of player and codecs. Others
to come.

Bug: 34715803
Test: booted, invoked new APIs to verify desired results
Change-Id: Iaae6406aadef30adc893952961ac154a7c4c761d
2017-01-27 17:58:30 +00:00
Jae Seo
434602faa9 TIF: Add types and "watch next" types for programs
Test: build
Bug: 34160270
Change-Id: I50bf7c36e33cd24bf80785150a2858cfec683546
2017-01-26 10:08:48 -08:00
Jae Seo
523415e814 TIF: Add more fields needed for new content recommendation
Test: build
Bug: 34160270
Change-Id: Ibb40ed39573049ace180ae319cebe96222f84b00
2017-01-26 08:58:50 -08:00
TreeHugger Robot
10dcfd3688 Merge "Add an intent that asks the launcher to make a channel browsable." 2017-01-26 08:30:12 +00:00
TreeHugger Robot
60d820b050 Merge "media: Add new MediaMuxer constructor that takes FileDescriptor." 2017-01-26 08:22:01 +00:00
TreeHugger Robot
da57f6b420 Merge "TIF: Add more fields for guide view on launcher" 2017-01-26 06:00:56 +00:00
Hyundo Moon
27c793146d Merge "ExifInterface: Accept decimal values for RATIONAL formats" 2017-01-26 04:55:59 +00:00
Elliot Waite
0ce4b0e4c3 Fix @links in reference docs. am: 54de77470d am: ab978c035e am: 28ba4722a9
am: 9b21265b2c

Change-Id: If246ebdb36cf2832d5a6c42cbe752e290b6fb6e8
2017-01-26 04:49:33 +00:00
Elliot Waite
28ba4722a9 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
2017-01-26 04:39:57 +00:00
Elliot Waite
ab978c035e Fix @links in reference docs.
am: 54de77470d

Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
2017-01-26 04:34:57 +00:00
Hangyu Kuang
61c74c6a4b media: Add new MediaMuxer constructor that takes FileDescriptor.
Test: Run new mediamuxer CTS test.
Bug: 34221063
Change-Id: Iaad4f0254782dca3e5994e80af0848482847c618
2017-01-25 18:31:02 -08:00
Nick Chalko
4bf00a2ca1 Add an intent that asks the launcher to make a channel browsable.
Test: Cts passes. Will add tests to Cts-Verifier.
Bug: 34354495
Change-Id: Ic441301a46790e15564a8d5e0d4e1ad4627680a1
2017-01-25 18:26:43 -08:00
Dongwon Kang
58266016c6 TIF: Add more fields for guide view on launcher
Test: build
Bug: 34160270
Change-Id: Icde5d2a9dd462df2c3acda24231dead173fde8dd
2017-01-25 18:23:05 -08:00
Elliot Waite
54de77470d Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
TreeHugger Robot
2fa71dd04a Merge "AudioTrack: Enable deep buffer mode from Java" 2017-01-26 00:22:54 +00:00
TreeHugger Robot
3416cc2800 Merge "mediaplayer: add buffering settings API" 2017-01-25 21:53:32 +00:00
Andy Hung
ebc2c14b07 AudioTrack: Enable deep buffer mode from Java
Test: AudioTrack CTS test, Play Movies
Bug: 30687201
Change-Id: Id3a8d675966671ed13c488936228bd76dfc6c1fe
2017-01-25 13:00:34 -08:00
Wei Jia
23dfee521a mediaplayer: add buffering settings API
Test: compiles, ensured that params is passed all the way to source
Bug:32524218

Change-Id: I90d65e10012ecc1a78989eba80d025d513ceaadf
2017-01-25 11:54:56 -08:00
Hangyu Kuang
82d2ea4a4f media: Relax the filedescriptor check to allow write-only mode.
Test: Use the MMS app to record video.
Bug: 34594319
Change-Id: I0680c48f5f240e2b18264dbf952622ad0497130b
2017-01-25 17:58:06 +00:00
TreeHugger Robot
b7cab6a190 Merge changes from topic 'bisto-request'
* changes:
  Allow privileged app to set media key event listener
  Allow privileged app to set volume key long-press listener
2017-01-25 01:16:32 +00:00
TreeHugger Robot
08bbfa9498 Merge "TIF: Add new TvContract fields for guide view on launcher" 2017-01-24 19:19:18 +00:00
TreeHugger Robot
59138c0004 Merge "Add intent to browse recording schedules" 2017-01-24 19:15:30 +00:00
Jaewan Kim
6e2b01ce75 Allow privileged app to set media key event listener
If the media key listener is set, the listener will receive the media key
events before any other sessions, but after the global priority session.
If the event is handled by the listener, other sessions cannot get the event.

Privileged app needs permission android.permission.SET_MEDIA_KEY_LISTENER
to set the listener.

Bug: 30125811
Change-Id: I2b2cf4ac7873b70899194701c6921990dcb9de02
2017-01-24 09:41:54 -08:00
Jaewan Kim
5026936e49 Allow privileged app to set volume key long-press listener
If the volume long-press listener is set, the listener will receive
the volume key long-presses instead of chaging the volume.

Privileged app needs permission
android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER to set the listener.

Bug: 30125811
Change-Id: I5e8fafbb950e5e11522da0f14004648d0877bf3e
2017-01-24 09:41:43 -08:00
TreeHugger Robot
110dad7c78 Merge "[SettingsProvider] Auto disable ringtone sync" 2017-01-24 15:05:26 +00:00
Andre Lago
7bdc6d80ef [SettingsProvider] Auto disable ringtone sync
Disable the SYNC_PARENT_SOUNDS setting if a work profile ringtone is set

Test: cts-tradefed --test com.android.cts.devicepolicy.ManagedProfileTest
Bug: 30658854
Change-Id: I172f5396b47f03ac8afa365db0ec90f3a2dd0e29
2017-01-24 11:12:02 +00:00
Chulwoo Lee
e0712b2661 Add intent to browse recording schedules
Test: Cts passes. Will add tests to Cts-Verifier.
Bug: 30843557
Change-Id: If84b3ae862f204a25343b0ad3b1c262826e6130e
2017-01-23 21:14:05 -08:00
Dongwon Kang
824413871a TIF: Add new TvContract fields for guide view on launcher
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 34160270
Change-Id: Ifaa0ef4bdc52623a6c686f1017340fdfab74872e
2017-01-23 16:10:44 -08:00
Hyundo Moon
644e1375e8 ExifInterface: Accept decimal values for RATIONAL formats
Prior to android N, ExifInterface.setAttributes() accepted the
decimal values for SRATIONAL/URATIONAL formats. However in android N,
decimal values for RATIONAL formats are rejected. Since this behavior
breaks the backward compatibility, we should make setAttributes()
accept decimal values as before.

Bug: 34269464
Test: flashed modified build on angler and tested with an app
Change-Id: I9a77ce341c8c8c3ea74c8592b5a821243eb0257d
2017-01-23 10:59:37 +09:00
Jean-Michel Trivi
e963003887 PlayerBase: unregistration in player release
The player state of PlayerBase was not kept in sync with its
  corresponding AudioPlaybackConfiguration. This caused
  the configuration to never be removed and gc'd because
  the state of PlayerBase when released was always the
  unitialized state of 0 == released state.

Test: use a MediaPlayer then call release, verify the player
  is not showing in the AudioService dumpsys
Bug: 30258418

Change-Id: I9a6704147949e1e45752e646648c8c882376752f
2017-01-21 15:53:11 -08:00
Hangyu Kuang
9deb7b5e73 Merge "media: Add new API to set next output file." 2017-01-19 18:17:45 +00:00
Hangyu Kuang
e176ee1222 media: Add new API to set next output file.
Only support recording to MP4 file now. When the recorded file is approcaching
file size limit, application will receive
MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING callback from mediarecorder.
Application could use setNextOutputFile to set the next output file before or
after receiving this callback. Upon reaching filesize limit, recorder will swap
the output file internally and notify application with
MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED.

Test: Hack camera app to record more than filesize limit.
Bug: 28150626
Change-Id: I2daf8f798fe3631d6b7ef48ebea3a64ab4566f2d
2017-01-18 17:32:17 -08:00
TreeHugger Robot
cc2a4210d7 Merge "Revert "MediaBrowserService: Add a constant for suggestion keywords"" 2017-01-18 23:35:29 +00:00
Jean-Michel Trivi
70efb52691 System API for a proxy for registered players
PlayerProxy is a wrapper on IPlayer for system components
  to control players.

Test: use vendor/google_toolbox/team/audio/cmds/ClPlaybackActivity
Bug 30258418

Change-Id: I6a40290c7f711fc0242597a5c016fc71cb4baa10
2017-01-17 15:42:42 -08:00
Jean-Michel Trivi
c1fdd5df4a Merge "AudioPlaybackConfiguration has a player control interface" 2017-01-14 23:39:12 +00:00
Jean-Michel Trivi
9dc22c227c AudioPlaybackConfiguration has a player control interface
An AudioPlaybackConfiguration contains an IPlayer
  interface for system control of a player. It is not
  exposed to non-system signature components.
AudioService, through PlaybackActivityMonitor, is monitoring
  the death of the IPlayer so the matching player can get
  unregistered  in case it meets its maker.

Test: use vendor/google_toolbox/team/audio/cmds/ClPlaybackActivity
Bug: 30258418

Change-Id: Ibf3bceba91882ff16bffbf1219c55a1f89ccb13f
2017-01-13 23:49:29 +00:00