Commit Graph

6692 Commits

Author SHA1 Message Date
Jaewan Kim
697eb9cebd MediaController2: Add fastForward() / rewind() am: ab715ec20b
am: bef45e5d16

Change-Id: I2d4e0e60bfc5d7b29c3a410b43a45e5892a00d86
2018-03-27 09:17:52 +00:00
Jaewan Kim
bef45e5d16 MediaController2: Add fastForward() / rewind()
am: ab715ec20b

Change-Id: I74be2d8ed5797e8f18966e0665942536b3ae6966
2018-03-27 08:53:48 +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
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
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
Jaewan Kim
3a1db72b2a Merge "MediaSession2: Revisit command code" into pi-dev am: ec0ab63ccb
am: 35aec5356e

Change-Id: I77bee1479944a701cdf18ec8ca52bddda21a4727
2018-03-26 11:31:23 +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
c3f3d4229e Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev am: e711ebc4fa
am: 669ceda153

Change-Id: I77160c04691a98c026a6810f30062d8ebf4fb52b
2018-03-26 08:34:36 +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
0550b85859 Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev am: c92f8b4053
am: 749deb1472

Change-Id: Ia369a5f5dc1ae89f651d4db92d134fda4bb62966
2018-03-26 05:43:41 +00:00
Jaewan Kim
9032b8b0b1 Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev am: a6ba53d69d
am: aa1f42103f

Change-Id: If6e9f52da2826fec1f82499f2dab498bbec0357c
2018-03-26 05:30:47 +00: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
e2851f9f61 Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev am: c4f56a6be5
am: 47ae32d079

Change-Id: Ie063d1b182888ffd3785815bc449b158f80488b4
2018-03-26 02:39:23 +00:00
Jaewan Kim
c4f56a6be5 Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev 2018-03-26 02:07:57 +00:00
Jaewan Kim
f1aed24371 Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev am: 46c07f3bd3
am: d59f42b70f

Change-Id: Iae4b9fab97a94c6b57c9c848b6bf60f1db3e6b24
2018-03-26 02:06:09 +00:00
Jaewan Kim
1796ce9a1c Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev am: a7fac1c115
am: 17c6654eb5

Change-Id: I62e9b70a5cfeaf815667796ed170dfec0bf7fbcd
2018-03-26 01:55:02 +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
Jean-Michel Trivi
047cfd0e9c Merge "PlayerBase: log when startWatching fails" into pi-dev am: 3d9601d60e
am: 73777b5598

Change-Id: Ibfa044249de8d783733bfc1ac899e5ff73f0ed10
2018-03-24 06:38:23 +00:00
TreeHugger Robot
3d9601d60e Merge "PlayerBase: log when startWatching fails" into pi-dev 2018-03-24 02:14:38 +00:00
Chong Zhang
da01efea07 Merge "insert exif info for HEIF files" into pi-dev am: 01aaabdea5
am: 011babb8c7

Change-Id: I33ab44c60707874dd421a10d0951dabb76442a52
2018-03-24 01:57:50 +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
Jack He
369a8fdfe6 Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am: cbb8cd77d5
am: e58e7bf155

Change-Id: Iaf338b1dcc1036deb9fb5a67a12f4ae1b63e032b
2018-03-23 09:02:36 +00: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
Sungsoo Lim
1b681749ce Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev am: ff1c9fa576
am: da1a34f4fc

Change-Id: Ia09e298f793c95fe79cf28c6e553151effa7ca1f
2018-03-23 08:05:47 +00:00
Hyundo Moon
c0e40846c0 Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev am: 9e5a7f2a63
am: 07d23014b3

Change-Id: Ia0fdc6d9808b8270c7e344d187a427ab959e3ecc
2018-03-23 07:49:42 +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