Commit Graph

6634 Commits

Author SHA1 Message Date
TreeHugger Robot
d41d56e348 Merge "Dynamics Processing Effect" into pi-dev 2018-03-31 00:05:32 +00:00
Rahul Frias
1b7162ad3d Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev 2018-03-30 20:33:24 +00:00
rago
1584bb80ce Dynamics Processing Effect
Fixing parameter integration with Dynamics Processing engine.

Bug: 64161702
Bug: 38266419

Test: manual testing and CTS tests
Change-Id: I0ff66d6fd60f2854aa93a45044cfa91c7ef344b3
2018-03-30 11:50:22 -07:00
TreeHugger Robot
cfe67aa575 Merge "Make back mic available when getting all available mic." into pi-dev 2018-03-30 16:59:41 +00:00
Rahul Frias
a0cbc6f6b0 Clarified app behavior on REQUEST_TYPE_NONE
Indicated that when this request type is returned in response
to a getKeyRequest no license exchange is required and
the key is available for use.

Bug: 73750909
Test: javadocs change only. Compiled Sailfish.
Change-Id: I4f124158160bf7e74f0228788c7b24bcefbb5dd0
2018-03-30 02:11:09 +00:00
Dongwon Kang
b814355d17 Merge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev 2018-03-30 01:25:59 +00:00
Dongwon Kang
2492c00ae3 Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT
Expose a listener constant which is used with OnInfoListener() in
order to notify that the player instance started the playback since
previous player just completed the playback.

Bug: 76121592
Test: make offline-sdk-docs
Change-Id: I69ade8e9f6916bc653ea2831e3721dc7d171dc0e
2018-03-29 15:14:26 -07:00
TreeHugger Robot
5fa492f9b6 Merge "Rename MediaDrm security levels" into pi-dev 2018-03-29 05:18:32 +00:00
TreeHugger Robot
7a3593d0b6 Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev
* changes:
  MediaBrowserService: Create getCurrentBrowserInfo()
  MediaSession: Create getCurentControllerInfo()
  MediaSessionManager: Add isTrustedForMediaControl()
2018-03-29 04:50:59 +00:00
Hyundo Moon
c2f557a49e MediaBrowserService: Create getCurrentBrowserInfo()
Bug: 65739365
Test: Ran MediaBrowserServiceTest
Change-Id: I629d74bcf9a08a2271463fecbacc2d998dce4387
2018-03-29 11:28:28 +09:00
Hyundo Moon
b1e344eaab MediaSession: Create getCurentControllerInfo()
Bug: 65739365
Test: Ran MediaControllerTest
Change-Id: I05c9179546d826e8fabb4fd4e4e03837dd4685ff
2018-03-29 11:25:03 +09:00
Jaewan Kim
b0e32b0856 MediaSessionManager: Add isTrustedForMediaControl()
The API checks whether an app is granted MEDIA_CONTENT_CONTROL
permisison or has enabled notification listener. Such apps can be
considered as the system component (e.g. Bluetooth) or equivalent (e.g.
Auto/Wearable companion app), so sessions shouldn't refuse connection
request from it.

It needs to be public because API for checking whether an app has an
enabled notification listener can only be called by the system service.
(see: NotificationManager.getEnabledNotificationListeners(int))
With the MediaSessionManager#isTrustedForMediaControl(),
MediaSessionService will query the information indirectly for a session
to tell an app is trusted.

Note that this isn't workaround for bypassing permission check of
NotificationManager API calls. It's indirectly available through
the android.provider.Settings.Secure with the *deprecated* key
ENABLD_NOTIFICATION_LISTENERS and it doesn't need any permission.
MediaSessionManager#isTrustedForMediaControl() is needed to avoid using
deprecated key for querying notification listeners.

Bug: 75500592
Test: Build
Change-Id: I8d1183aa946aa0d2ec35dbd7f31933d1c2717f99
2018-03-29 11:19:20 +09:00
Jeff Tinker
cbbab8339c Rename MediaDrm security levels
API review requested that MediaDrm security
levels be prefixed with a common string.

bug:76449152
bug:74831432
Change-Id: I2b4d5ed2c881f736659f29aa76c556a79d1335f4
2018-03-28 17:16:50 -07:00
Jean-Michel Trivi
26ef7344c9 Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev 2018-03-28 20:30:02 +00:00
Jean-Michel Trivi
aabf284cbb MediaPlayer subtitle data / time discontinuity interfaces
Expose in SDK the interfaces necessary to implement unbundled
  subtitle support, which requires:
  - exposing an interface to receive the encoded subtitle data
  - exposing an interface while allows a renderer to synchronize
    its rendering clock with the media time of the player.
Deprecate duplicated timed text constant, all timed text / sub
  mime types are defined in MediaFormat.

Bug: 76121592
Test: make offline-sdk-docs
Change-Id: I42cc1d69069babb69a2feeba3f54da89889f4602
2018-03-28 11:35:14 -07:00
jiabin
9697c6c561 Make back mic available when getting all available mic.
Remove the checkType of filtering back mic. Make getAddress() public in
AudioDeviceInfo to distinguish different built in mic.

Bug: 64038649
Test: run cts
Change-Id: I943b7f74f44db7068644f5ffa1b5410cbf567f11
2018-03-28 08:23:19 -07:00
Clément Julliard
a7d2de4868 Relax constraints on valid ImageReader usage flags
The only allowed format - usage pairs are currently:
* PRIVATE with USAGE_GPU_SAMPLED_IMAGE
* PRIVATE with USAGE_VIDEO_ENCODE
* PRIVATE with USAGE_GPU_SAMPLED_IMAGE | USAGE_VIDEO_ENCODE
* Non-PRIVATE with USAGE_CPU_READ_RARELY
* Non-PRIVATE with USAGE_CPU_READ_OFTEN

This commit enable other cases, ie. PRIVATE with
GRALLOC_USAGE_HW_COMPOSER.

Bug: 77148005
Test: Manually tested it.
Change-Id: I414c25bc62d52a3573461df6cec4d88512509ec4
2018-03-27 13:48:27 -07:00
Jerry Zhang
bb54f62d1a Merge "Guard against null server" into pi-dev 2018-03-27 17:54:21 +00:00
Jaewan Kim
51e33d1948 Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev
* changes:
  MediaPlayerBase: Add PlayerEventCallback#onSeekCompleted()
  MediaSession2: Pull out Command/CommandGroup from the MediaSession2
  MediaController2: Add fastForward() / rewind()
2018-03-27 08:39:45 +00:00
TreeHugger Robot
30d648ab7a Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev 2018-03-27 07:57:14 +00:00
Jaewan Kim
598265bd86 MediaPlayerBase: Add PlayerEventCallback#onSeekCompleted()
PlayerEventCallback#onSeekCompleted() will be called when the
MediaPlayerBase#seekTo() is completed. Following callbacks are also
added to listen the event.
  - SessionCallback#onSeekCompleted()
  - ControllerCallback#onSeekCompleted()

Bug: 74370608
Test: Build
Change-Id: Ib1ecd75f7e217ed9a927db3ab443073a1aef2074
2018-03-27 16:51:51 +09:00
Jaewan Kim
3b15124ecc MediaSession2: Pull out Command/CommandGroup from the MediaSession2
Bug: 74648408
Test: Build
Change-Id: I0a3d1ab6320c7b276e7b1defdccf9fa371ae02c0
2018-03-27 16:48:26 +09:00
Jaewan Kim
ab715ec20b MediaController2: Add fastForward() / rewind()
Following CLs are included
  - Add MediaController2#fastForward() / rewind()
  - Add MediaSession2.SessionCallback#onFastForward() / rewind()

Bug: 74724709
Test: Build
Change-Id: I0dd2b6c21931df937006ae26011ea9538720afee
2018-03-27 16:48:26 +09:00
TreeHugger Robot
72e895fd9f Merge "Remove unneeded context" into pi-dev 2018-03-27 07:17:24 +00:00
Jin Seok Park
473201868c ExifInterface: Remove casting int[] to long[]
This CL removes code that directly casts int[] to long[] and instead
iterates through the individual values and casts to int if necessary.
They are cast to integer because StripOffsets/StripByteCounts
Attributes can return either int[] or long[] values, but the maximum
length of a file that ExifInterface can handle is the maximum value
of integer, so it should be safe to cast the long values to integer
values.

Bug: 73091048
Test: Cts
Change-Id: I9f3b98204e0829a8a8a30927bb8c0a698c457654
2018-03-27 14:58:52 +09:00
Jerry Zhang
02a005703a Merge "Revert "Add additional context to MtpDatabase"" into pi-dev 2018-03-27 02:49:30 +00:00
Jerry Zhang
df101a4596 Merge "Write descriptors for Mtp in UsbService" into pi-dev 2018-03-27 02:49:02 +00:00
Christofer Åkersten
6823d81d8c Remove unneeded context
Bug: 76001644
Test: compile
Change-Id: Ib6d581650ff22d90da2bdc9ad295eab595aefb25
2018-03-27 11:33:17 +09:00
Christofer Åkersten
855617501c Merge "Hide Media*2 APIs" into pi-dev 2018-03-27 01:46:42 +00:00
Jerry Zhang
2ecbc7acdb Guard against null server
If MtpService stops before MtpServer
shuts down, the server will be null,
so don't attempt to use it in that
case.

Bug: 76433619
Test: no errors
Change-Id: I6744cb78908e6a0663a4b60107d5c9c18dda62bb
2018-03-27 00:01:33 +00:00
TreeHugger Robot
0aeb374380 Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev 2018-03-26 16:06:22 +00:00
Jaewan Kim
d21b33d8ca Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev 2018-03-26 10:55:30 +00:00
Jaewan Kim
449e358fea Merge "MediaMetadata2: Remove radio constants" into pi-dev 2018-03-26 10:53:24 +00:00
Jaewan Kim
ec0ab63ccb Merge "MediaSession2: Revisit command code" into pi-dev 2018-03-26 10:52:22 +00:00
Jaewan Kim
2a35051051 MediaSession2: Add CommandGroup#add/removeCommand(int)
Bug: 74648408
Test: Build
Change-Id: Icfcde5946e75ad74c2123be8064eb365366f5960
2018-03-26 08:10:22 +00:00
Jaewan Kim
c889c307b0 MediaMetadata2: Remove radio constants
Removeing radio constants until their names are finalized.

Bug: 75500592
Test: Build
Change-Id: I6f7a219c19dd24579a76c2064e9781ca53618c69
2018-03-26 17:07:12 +09:00
Jaewan Kim
a84c9eb1c4 MediaSession2: Change return type of CommandGroup#getCommands()
Bug: 74648408
Test: Build
Change-Id: I443dd0a1f244b285754561a4c485ef2e8530d42d
2018-03-26 15:30:44 +09:00
Jaewan Kim
e32fa0db4a MediaSession2: Revisit command code
Bug: 74648408
Test: Build
Change-Id: I0c66d6dec7f5a25bd4c36aa6e2c140951ea38855
2018-03-26 15:28:40 +09:00
Jaewan Kim
c92f8b4053 Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev 2018-03-26 05:12:17 +00:00
Jaewan Kim
a6ba53d69d Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev 2018-03-26 04:57:48 +00:00
Jaewan Kim
c4f56a6be5 Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev 2018-03-26 02:07:57 +00:00
Jaewan Kim
46c07f3bd3 Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev 2018-03-26 01:31:54 +00:00
Jaewan Kim
a7fac1c115 Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev 2018-03-26 01:24:21 +00:00
Jack He
890e4e4546 AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString
Bug: 72647074
Test: make, dumpsys audio
Change-Id: Ieaf2bf0e0ef6624409d1e91d9a1d232726460fc7
2018-03-24 00:21:16 -07:00
TreeHugger Robot
3d9601d60e Merge "PlayerBase: log when startWatching fails" into pi-dev 2018-03-24 02:14:38 +00:00
TreeHugger Robot
01aaabdea5 Merge "insert exif info for HEIF files" into pi-dev 2018-03-23 22:17:35 +00:00
Jean-Michel Trivi
b8748c65b8 PlayerBase: log when startWatching fails
Bug: 75274546
Test: set DEBUG to true, verify appOps logs in logcat
Change-Id: I19506372188dbaec0976733856513a94da75d2ea
2018-03-23 10:35:19 -07:00
TreeHugger Robot
cbb8cd77d5 Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev 2018-03-23 08:22:56 +00:00
Jaewan Kim
6fac589d48 MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()
Bug: 74093080, Bug: 75500592
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ibdb3bc9e3fb379c2533eb7f1867e399769f9bb72
2018-03-23 16:21:47 +09:00
Jaewan Kim
888ccd17aa MediaSession2: Match APIs with MediaPlayerBase
Bug: 75500592
Test: Build
Change-Id: Ic2cf1fc9a9d11752d84ff6f69905b5983e57d10a
2018-03-23 16:08:33 +09:00