Commit Graph

6874 Commits

Author SHA1 Message Date
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
Dongwon Kang
2f3c9f6298 Merge "Unhide MediaPlayer#MEDIA_INFO_STARTED_AS_NEXT" into pi-dev am: b814355d17
am: 2eab17bc73

Change-Id: Ieb5f63bf9a1c3a127c3ccd0a42d7831891a1eb1e
2018-03-30 15:10:14 +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
Jeff Tinker
6a8ee550a9 Merge "Rename MediaDrm security levels" into pi-dev am: 5fa492f9b6
am: 46fd63a9ea

Change-Id: I7bb400b5eb5478f57427be99966299bd71131246
2018-03-29 06:56:37 +00:00
Hyundo Moon
5cde2e44a8 Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev am: 7a3593d0b6
am: 455dac3ab6

Change-Id: Id4c58987d0b75045d4ac2e9a46b3bd52f4ba3294
2018-03-29 06:48:52 +00: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
f2135d166f Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am: 26ef7344c9" into pi-dev-plus-aosp
am: 77fca22044

Change-Id: Icc7994f8625023f2f5c9c76081e17b9d6d166f19
2018-03-28 22:48:11 +00: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
550c19a6af Merge "Relax constraints on valid ImageReader usage flags" into pi-dev am: fa43016626
am: a60cdac406

Change-Id: I7e17a6c16ec9efe64a7b5f306340cb86563fecab
2018-03-28 03:02:21 +00: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
7ac61994d8 Merge "Guard against null server" into pi-dev am: bb54f62d1a
am: c5febd24e0

Change-Id: I4d170d7b5acfce6f7386d06a4999bfb208f7128d
2018-03-27 19:23:35 +00:00
Jerry Zhang
bb54f62d1a Merge "Guard against null server" into pi-dev 2018-03-27 17:54:21 +00:00
Shubang
30f236711f Add a column for series ID
This column helps us to group programs of the same series, which is
useful for some featues such as series recording.

Bug: 73342889
Test: make;
Change-Id: Ied25189ef4bbc72109192ec2e6f954d9f8e49f07
2018-03-27 17:08:51 +00:00
Jaewan Kim
a55fc7d548 Merge changes from topics "session2_seekcompleted", "session2_pullout", "session2_fastforward" into pi-dev am: 51e33d1948
am: 4aa935c9ca

Change-Id: I20d38121ccdf50c07a1955b0cd4ec14249e91a2a
2018-03-27 09:24:27 +00:00
Jaewan Kim
032b4a7e7f MediaSession2: Pull out Command/CommandGroup from the MediaSession2 am: 3b15124ecc
am: 13585d0af1

Change-Id: I7b2d2d5bb2273e522de4c3f5b244207468a8869f
2018-03-27 09:21:21 +00:00
Jaewan Kim
697eb9cebd MediaController2: Add fastForward() / rewind() am: ab715ec20b
am: bef45e5d16

Change-Id: I2d4e0e60bfc5d7b29c3a410b43a45e5892a00d86
2018-03-27 09:17:52 +00:00
Jaewan Kim
13585d0af1 MediaSession2: Pull out Command/CommandGroup from the MediaSession2
am: 3b15124ecc

Change-Id: Ied11e199086ab29d01ca84e04e42e28fdd6b6eee
2018-03-27 08:59:03 +00:00
Jaewan Kim
bef45e5d16 MediaController2: Add fastForward() / rewind()
am: ab715ec20b

Change-Id: I74be2d8ed5797e8f18966e0665942536b3ae6966
2018-03-27 08:53:48 +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
Jin Seok Park
81ff4d8696 Merge "ExifInterface: Remove casting int[] to long[]" into pi-dev am: 30d648ab7a
am: 23f169747c

Change-Id: Ie5d32c1d540883b78cc0fac59ebd803994e7e755
2018-03-27 08:21:22 +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
Christofer Åkersten
8878c688eb Merge "Remove unneeded context" into pi-dev am: 72e895fd9f
am: a4d3ac7988

Change-Id: I8c5eabd47fc655b51854d7f05102c74a1b9bb081
2018-03-27 07:46:09 +00: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
826a7f05ba Merge "Revert "Add additional context to MtpDatabase"" into pi-dev am: 02a005703a
am: 66cb4826ef

Change-Id: I2f4a5c41e9c1a4bb22df77989c27467eca518c4b
2018-03-27 04:22:06 +00:00
Jerry Zhang
e52c2b98e9 Merge "Write descriptors for Mtp in UsbService" into pi-dev am: df101a4596
am: 03f2788598

Change-Id: If6a24ce29d891159a60e4690eb82ef83b2f82885
2018-03-27 03:57:23 +00: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
a1f04b92a7 Merge "Hide Media*2 APIs" into pi-dev am: 855617501c
am: 1cbf0b4c60

Change-Id: Ib8febd8195ede10de7307ff3ac3c8daa6c5dcfb9
2018-03-27 02:43:00 +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
Jack He
78019b5526 Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev am: 0aeb374380
am: 7d0fc82dcc

Change-Id: Iebeb1c544a22ffc873880e7907f01aaf9d510324
2018-03-26 16:34:44 +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
33aa928d68 Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev am: d21b33d8ca
am: d3cc889fbc

Change-Id: I45eee1b4aa2a59f5d1e59f52ae83c94f6f097708
2018-03-26 11:55:36 +00:00
Jaewan Kim
e1dfa80980 Merge "MediaMetadata2: Remove radio constants" into pi-dev am: 449e358fea
am: defbb859d0

Change-Id: I668e161066178503e55b7f902d134b2bfcb7d078
2018-03-26 11:50:00 +00:00