11624 Commits

Author SHA1 Message Date
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
Paul Duffin
56a2ae1056 Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588
am: ab62fd67d8

Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c
2017-01-19 11:44:56 +00:00
Paul Duffin
ccb0445027 Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)

Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
2017-01-19 09:43:05 +00:00
Paul Duffin
648abd31e8 Merge "Prepare for removal of legacy-test from default targets" 2017-01-19 09:34:19 +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
Paul Duffin
8aeb59ebcd Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: I13e88297731253420e4e5f5291d503f13a39a156
2017-01-18 16:39:34 +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
Mark Salyzyn
db15537e6e resolve merge conflicts of 082a1721b516 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
2017-01-11 08:30:17 -08:00
Mark Salyzyn
ef8ccc8510 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
2017-01-11 15:40:24 +00:00
Mark Salyzyn
52eb4e01a4 Replace cutils/log.h and log/logger.h with log/log.h
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I578b15b48f0fc2807a92abbc69a377c3d2191496
2017-01-09 14:31:34 -08:00
TreeHugger Robot
677e297537 Merge changes from topics 'List parent profile custom ringtones from managed profile', 'Add/delete custom ringtones from storage'
* changes:
  [RingtoneManager] Option for cursor to list parent sounds
  [RingtoneManager] API to delete custom ringtones
  [RingtoneManager] API to add custom ringtones
2017-01-06 19:35:59 +00:00
Julia Reynolds
bb983d20d2 Use internal volume controller and status bar.
Remove code that let these components be replaced by external
processes.

Bug: 33006669
Bug: 34106436
Test: manual. reboot device, play music, change volume,
view notifications
Change-Id: I458f11537ab9db6f23735487513815553004613f
2017-01-06 15:59:45 +00:00
Andre Lago
dc50b548ff [RingtoneManager] Option for cursor to list parent sounds
Modify RingtoneManager.getCursor so that the cursor returned also
retrieves the parent profile's ringtones, adding the parent's id to
those ringtones

Test: manual (use ringtone picker in associated CL)
Bug: 30658854
Change-Id: I3b52b0dc41a5a3ff1a71a89fd8a0d33023021aba
2017-01-05 19:06:35 +00:00
Andre Lago
178693a5df [RingtoneManager] API to delete custom ringtones
Given a Uri, if it is a media file in one of the external ringtone
storages, this API deletes its file and database entry.

Test: manual - associated CL
Bug: 30658854
Change-Id: I987bd18577960f9a2b02ce37a4a2d5d033d7a969
2017-01-05 19:06:34 +00:00
Andre Lago
7c8ccb3ce4 [RingtoneManager] API to add custom ringtones
So far, the only way for users to add custom ringtones was to either use
a 3rd party app or copy files to a specific directory in the storage,
and there was no API to make it easier to add custom ringtones.

This CL creates a hidden API in RingtoneManager that allows adding any
audio file as a custom ringtone, by copying that file into the ringtone
storage and asking MediaScanner to scan that file.

This API is not intended to be used by existing apps, but an associated CL
uses it in RingtonePickerActivity

Test: make && vendor/google/tools/flashall, plus manual testing with associated CL
Bug: 30658854
Change-Id: I2b291847c5430e1fc2c3fc6a351b6111a49fcbf3
2017-01-05 19:06:14 +00:00
TreeHugger Robot
6e3c246e2b Merge "Fix typo in comment in IAudioService.aidl" 2017-01-04 20:02:28 +00:00
TreeHugger Robot
d61d501a06 Merge "Player activity notification: move some intialization server-side" 2017-01-04 18:37:43 +00:00
Jean-Michel Trivi
359b91dc68 Fix typo in comment in IAudioService.aidl
Test: none, typo in comment
Change-Id: I6f8803d3d551649fc322414980b2b4bf7d437d9d
2017-01-04 10:20:14 -08:00