Commit Graph

10881 Commits

Author SHA1 Message Date
Kyunglyul Hyun
475bb88df9 Merge "Add missing tests for filtering routes" 2022-02-09 10:57:14 +00:00
Kyunglyul Hyun
54a4a1d5e0 Add missing tests for filtering routes
To test package orders, host side tests are added.
AllowedPackages istested as well.

Additionaly, RouteDiscoveryRequest#getRequiredFeatures is removed
as it doesn't seem to be necessary.

Adding tests, some bugs are found and fixed.

Test: atest MediaRouter2HostTest android.media.cts.MediaRouter2Test
MediaRouter2ManagerTest
Bug: 193631822

Change-Id: I315d6e0d648777566404875e300030740a482c81
2022-02-09 15:37:05 +09:00
John Reck
2be791c7de Merge "Add setDataSpace SurfaceControl API" 2022-02-08 21:49:24 +00:00
Hongguang Chen
4e0993c6b6 Merge "Release locks when closing." 2022-02-08 19:43:32 +00:00
Henry Fang
5dbd4b27ed Merge "Guard TIF vendor extension APIs by new permission" 2022-02-08 17:19:28 +00:00
Hongguang
2eebb7dd3f Release locks when closing.
Bug: 218228680
Fix: 218228680
Test: atest android.media.tv.tuner.cts 20 times
Change-Id: I31d6c65d9fb7e512d6dfbc7080214a9a766b38fa
2022-02-07 19:59:33 -08:00
John Reck
ffa81f86ba Add setDataSpace SurfaceControl API
Also change DataSpace from long to int (HAL & native are both ints)

Bug: 217776226
Fixes: 218320444
Test: make && SurfaceControlTest#testSurfaceTransaction_setDataSpace
Change-Id: Ic2b9ccb1d0ba3c1d049839310b4fef0881a3d2e2
2022-02-08 03:05:30 +00:00
Kyeongkab.Nam
5e4c395cdb Guard TIF vendor extension APIs by new permission
Guard TvInputManager#getAvailableExtensionInterfaceNames() and
TvInputManager#getExtensionInterface() by
android.Manifest.permission.TIS_EXTENSION_INTERFACE.

Bug: 215189795
Bug: 193052431
Test: run cts -m CtsTvTestCases -t
android.media.tv.cts.TvInputManagerTest

Change-Id: I43d4f063b0a602f00f7f71e8fe08fb09c7a763bf
2022-02-07 12:19:54 -08:00
Sally Qi
8b60c74500 Merge "Add fence support in ImageWriter class." 2022-02-07 20:19:20 +00:00
Patrick Rohr
c52a30c5c8 Merge "Fix tuner filter delay API" 2022-02-07 13:03:17 +00:00
Oliver Woodman
eafc743581 Merge "RouteDiscoveryPreference cleanup" 2022-02-07 10:49:57 +00:00
Sally Qi
d2087e7781 Add fence support in ImageWriter class.
- Add SyncFence class that include FileDescriptor and related functions
- expose fence file descriptor setter/getter in the Image class

Bug: 210919185
Test: android.hardware.camera2.cts.ImageWriterTest
Change-Id: I7428db26e3e6ca84675d2ce2ef4def46ed0b1397
2022-02-04 21:09:37 -08:00
Avichal Rakesh
6eec418572 Merge "Revert "Prevent onImageAvailable from being called on stale listeners"" 2022-02-05 00:19:24 +00:00
Yixiao Luo
8664134527 Merge "TIAF: add missed type TableRequest in base class parcel creator" 2022-02-04 22:58:38 +00:00
Avichal Rakesh
ea4dbac40a Revert "Prevent onImageAvailable from being called on stale listeners"
This reverts commit 666ad3a9ac.

Reason for revert: This CL breaks Google Translate
Bug: 217847856

Change-Id: I5510ece72c2bc65d838d176f88a0ceaadb8faadb
2022-02-04 21:46:23 +00:00
Oliver Woodman
0d9bcf1ea0 RouteDiscoveryPreference cleanup
1. Make sure newly added lists are non-null in builder
2. Fix variable name & add some extra documentation

Bug: 193631822
Test: atest MediaRoute2InfoTest RouteDiscoveryPreferenceTest
Change-Id: I93ed43acb6113f33f8010cb2ec4b4e0ad98d0b45
2022-02-04 19:21:34 +00:00
Nathalie Le Clair
dbad339f5f Merge changes from topics "AudioDeviceAttributes_update", "ShortAudioDescriptors"
* changes:
  Inform AudioManager about ARC SADs
  Add AudioDeviceAttributes as argument to AudioManager API
  Add fields to AudioDeviceAttributes class
2022-02-04 14:11:19 +00:00
Kevin Rocard
00fc90e3b9 Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947 am: 7a30e9f8dd am: 326230d491
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902510

Change-Id: Ica2a9bc91dbdf8ab878b0cbfa141e5935735ce6f
2022-02-04 12:34:48 +00:00
Kevin Rocard
326230d491 Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947 am: 7a30e9f8dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902510

Change-Id: Id4d857c4384d5162d8821e4759e9370b7a75eaa1
2022-02-04 12:16:56 +00:00
Kevin Rocard
7a30e9f8dd Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1902510

Change-Id: I31535966123faa6e06c1c8b10178a880242d9f27
2022-02-04 12:06:31 +00:00
Patrick Rohr
73b2197a51 Fix tuner filter delay API
Renamed delayCallbackUntilMillisElapsed to
delayCallbackForDurationMillis according to API feedback. Made parameter
more consistent with the method name.

Test: m && atest android.media.tv.tuner.cts.TunerTest
Bug: 213174673
Change-Id: I296c56078a4089d456c0a2359cacfd37d4922f7d
2022-02-04 12:36:16 +01:00
Kevin Rocard
06c8be69b9 Merge changes I17264f0e,I0581978f
* changes:
  Limit transcoding size workaround to windows
  Workaround to fixup MTP transcode file size
2022-02-04 11:25:53 +00:00
Yixiao Luo
2c527b4453 TIAF: add missed type TableRequest in base class parcel creator
Bug: 217775517
Change-Id: I088868eae550cb9a02d18642ad81ce3e3854c4c6
2022-02-03 16:07:16 -08:00
Avichal Rakesh
fee4185e05 Merge "Prevent onImageAvailable from being called on stale listeners" 2022-02-03 18:39:25 +00:00
TreeHugger Robot
0d857467ad Merge "Return a collection in getAllAtsc3PlpInfo()" 2022-02-03 07:05:39 +00:00
William Escande
a4249a2eae Merge "BtProfileConnectionInfo update api review" am: cc2c6a0783 am: c2abbda875 am: e18d1a7581 am: 8e1857760f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959343

Change-Id: Icdbc1b6d404ae1c95358c9d7b65557b10cb3be98
2022-02-03 00:38:25 +00:00
William Escande
8e1857760f Merge "BtProfileConnectionInfo update api review" am: cc2c6a0783 am: c2abbda875 am: e18d1a7581
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959343

Change-Id: Ia53a3e37cef1e55534ceee5e977c5b65e9928153
2022-02-03 00:23:16 +00:00
William Escande
e18d1a7581 Merge "BtProfileConnectionInfo update api review" am: cc2c6a0783 am: c2abbda875
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959343

Change-Id: I1659669f4ac73a69683dbcbc3af3bf7839f89ce2
2022-02-03 00:06:13 +00:00
Hongguang
beab1f68e8 Return a collection in getAllAtsc3PlpInfo()
Bug: 216529056
Fix: 216529056
Test: atest android.media.tv.tuner.cts
Change-Id: I9b5314069000fff54c301bf3209b3d6ae7c3428f
2022-02-02 15:53:38 -08:00
Hongguang
2cd6d7f11d Fix wrong IntDef flag
"flag" is used to define whether the constants can be used as a flag, or
just just as an enum (the default). All constants are enums.

Bug: 174239416
Fix: 174239416
Test: make and atest android.media.tv.tuner.cts
Change-Id: I61b4335d62a62c79cc57b84a8d90f8c6e8a18443
2022-02-01 23:13:28 -08:00
William Escande
7c83aef755 Missing line that generate merge conflict
Test: not needed at all
Change-Id: Id7fec98705fd82b7ecc8060432f4b9d1cbecdca7
2022-02-01 19:42:24 +01:00
TreeHugger Robot
9aac3354b2 Merge "cherry-pick of aosp/1959811" 2022-02-01 13:16:52 +00:00
Oliver Woodman
e685a9dd49 Merge "Make deduplication order non-null" 2022-02-01 10:33:59 +00:00
Roopa Sattiraju
025115fcb9 Merge "Adding SystemApi for remaining AudioManager errors" 2022-01-31 19:31:59 +00:00
Oliver Woodman
fe776fa635 Make deduplication order non-null
Bug: 193631822
Test: atest MediaRoute2InfoTest RouteDiscoveryPreferenceTest
Change-Id: Ic9df0093f473175b1d89e009a4fcb7157c2ef0c6
2022-01-31 18:31:46 +00:00
William Escande
eb01666b8d cherry-pick of aosp/1959811
Due to bigest topic on aosp, the cl has not been merged in internal
This CL is only to reduce merge-conflict between aosp and internal
Test: build

Change-Id: I47edabfbcbd2eb15650194d6234f54c16d74ed07
2022-01-31 19:21:38 +01:00
William Escande
ac11d77264 BtProfileConnectionInfo update api review
BtProfileConnectionInfo: rename class to BluetoothProfileConnectionInfo
<>.hearingAidInfo: rename to createHearingAidInfo
<>.leAudio: rename to createLeAudio
<>.getIsLeOutput: rename to isLeOutput
<>.getSuppressNoisyIntent: rename to isSuppressNoisyIntent

Did a bit more to keep consistency with a2dp & a2dpSink

Test: build
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Fix: 216294722
Tag: #refactor
Change-Id: I2c4cf8d93b1a8840da1bf92c26d4e76140d0d8da
2022-01-31 19:11:07 +01:00
Oliver Woodman
083297ec6b Merge "Add more options on RouteDiscoveryPreference" 2022-01-31 15:06:15 +00:00
Roopa Sattiraju
fb93324e59 Adding SystemApi for remaining AudioManager errors
Bug: 206121418
Test: Compile apex
Change-Id: Ia0bbabc26132893923706917ce716a6f7375bfe1
2022-01-30 21:30:10 +00:00
Roopa Sattiraju
f2675c7315 API changes requires for Bluetooth apk inside the apex to build.
Bug: 216731966
Test: atest BluetoothInstrumentationTests
Change-Id: Idc16950373e0d90f77f1abc743127a25c09db03d
2022-01-29 00:23:58 +00:00
Kyunglyul Hyun
13e06b44db Add more options on RouteDiscoveryPreference
Specifically,
- mandatory features
- allowed list of packages
- package order for de-duplication

Those can be used to filter out unwanted routes or duplicate routes.

Bug: 193631822
Test: atest MediaRoute2InfoTest RouteDiscoveryPreferenceTest
Change-Id: I506e6dd2c5152d9a3127d6f34856c258bb750daa
2022-01-28 20:06:48 +09:00
Henry Fang
71a3900ab0 Merge "Unhide TvInputManager#getClientPid()" 2022-01-28 03:42:01 +00:00
Kyeongkab.Nam
81a7bdb52b Unhide TvInputManager#getClientPid()
Make TvInputManager#getClientPid() to System SDK API for MediaCodec
resource reclaiming on multi-window w/ multi TV apps.

Bug: 179813957
Test: run cts -m CtsTvTestCases -t
    android.media.tv.cts.TvInputManagerTest
Change-Id: Ifd5193707979f7e5f3e2e9061a81d0f7286e7d64
2022-01-27 23:24:53 +00:00
Hongguang
679b24c698 Update FrontendStatusReadiness APIs.
Bug: 216640182
Fix: 216640182
Test: atest android.media.tv.tuner.cts
Change-Id: I54abc1014bab2a2cb6128e33a381aabbe571dc58
2022-01-27 12:57:26 -08:00
Lajos Molnar
d42cf0d415 Merge "media: added advanced HDR-ready CamcorderProfiles" 2022-01-27 17:21:27 +00:00
Kevin Rocard
dbbca05d9d Merge "Catch ArrayIndexOutOfBoundsException in ExifInterface" 2022-01-27 12:08:42 +00:00
Treehugger Robot
02e9d83488 Merge "Updates to Dolby Vision Levels" am: e7dd66d7db am: d1928adcae am: 498e2b7944 am: cd60d3b2e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961619

Change-Id: I820a527914981546f5966f61ea2bfb54cb8b6f53
2022-01-27 11:39:24 +00:00
Treehugger Robot
cd60d3b2e6 Merge "Updates to Dolby Vision Levels" am: e7dd66d7db am: d1928adcae am: 498e2b7944
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961619

Change-Id: I621e97adabcd9ff2dc8b9ddabdb1684eaba3f55d
2022-01-27 11:21:54 +00:00
Treehugger Robot
498e2b7944 Merge "Updates to Dolby Vision Levels" am: e7dd66d7db am: d1928adcae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961619

Change-Id: I4efc107ec69ac886a8408490d63c71a54f2b323d
2022-01-27 11:05:19 +00:00
Treehugger Robot
e7dd66d7db Merge "Updates to Dolby Vision Levels" 2022-01-27 09:34:53 +00:00