Commit Graph

823 Commits

Author SHA1 Message Date
Kyunglyul Hyun
65600663fa Merge "Filter selectable/deselectable routes" into rvc-dev am: 2eec783e52
Change-Id: I896b45883d8e470cf5e0f510b94b0786c056e013
2020-05-08 10:39:12 +00:00
Kyunglyul Hyun
45512bbd54 Filter selectable/deselectable routes
Only selected routes can be deselectable and not selected routes
can be selectable from this CL.

Bug: 154918270
Test: Manually and atest mediaroutertest
Change-Id: I2e66d814190b003c935b21a744d24fa2b5d2c7ac
2020-05-08 17:36:33 +09:00
James Wei
bf000f93e4 Merge changes I7da699ca,I5a09efef into rvc-dev am: f21e3a96d3
Change-Id: I6ab184863727b8889eea902604d353267cd58f26
2020-04-22 06:37:20 +00:00
James Wei
82062b99eb MTP: Fix MTP SD card issue
Modify MTP access path for SD card in accordance with Storage Permission change

Bug: 150188237

Test: atest MtpTests
Test: Manual test: MTP file browsing / copy on SD card
Change-Id: I7da699ca04844514827af18b0318c66d2a3fbc6e
2020-04-22 11:34:42 +08:00
James Wei
19ded228a3 MTP: Add MtpDatabase unit test
Add Thumbnail feature test cases

Bug: 117863715
Test: atest MtpTests
Change-Id: I5a09efef10df20e382a4c623481e048e7b35ff14
2020-04-22 03:20:02 +00:00
Kyunglyul Hyun
310eb3355f Merge "Use session hints when create a session from MR2Manager" into rvc-dev am: e66ac51ea3
Change-Id: I6b5b7387030050ed3eeb3ec1a039e19ceccf3d44
2020-04-21 11:25:32 +00:00
Kyunglyul Hyun
e66ac51ea3 Merge "Use session hints when create a session from MR2Manager" into rvc-dev 2020-04-21 11:17:38 +00:00
Kyunglyul Hyun
ba4888173b Merge "Clear routes when media router manager has no callback" into rvc-dev am: 1bb914e8ec
Change-Id: I68f63ca17a778b2db785f24d08e15e324c6f64f3
2020-04-21 08:01:35 +00:00
Kyunglyul Hyun
350d7b427e Clear routes when media router manager has no callback
This CL clears routes when the last callback of MediaRouter2Manager
is unregistered. By doing this, we can ensure
MediaRouter2Manager#getAvailableRoutes() returns correct routes
during at least a single callback is registered.

A test for the behavior is added as well.

This CL also fixed a bug that unregistering a callback from MediaRouter2
disconnects it when multiple callback is used.

Bug: 153515567
Test: atest mediaroutertest & cts test & manually
 using MediaRouter2Demo and Sample OutputSwitcher to see
 if forgotten BT device is correctly removed.
 (w/o this CL forgotten BT device remains)
Change-Id: I31a5001115f1f163c8971bbd906516551b860252
2020-04-21 14:58:31 +09:00
Kyunglyul Hyun
f0eb51bc40 Use session hints when create a session from MR2Manager
When MR2Manager requests to create a routing session, it should pass
session hints to the target provider.
This CL adds a logic that MR2Manager asks media router instance to
get session hints to be passed to the provider.

Bug: 152851868
Test: atest mediaroutertest
Change-Id: Ib421f61f663090c6ed95c8b1a2f7deeb80e5be16
2020-04-21 14:17:08 +09:00
Eric Laurent
48b9be33e1 Merge "AudioManager: Add functional tests for productstrategy/volumegroup" into rvc-dev am: 5fb2147af2
Change-Id: I70963769ee5d6184a7cc34bcb654d76dbd5c15c8
2020-04-14 22:56:50 +00:00
Francois Gaffie
8650e2d23d AudioManager: Add functional tests for productstrategy/volumegroup
Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioProductStrategyTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupChangeHandlerTest com.android.audiopolicytest

Bug: 136121584

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Ia7e92ff37ff9c5e51bc2b5fe54b15c6338868b23
2020-04-14 12:48:24 -07:00
Kyunglyul Hyun
16ae9a39b3 Merge "Call MediaRouter2Manager#onTransferred" into rvc-dev am: bd67f0ad34
Change-Id: I5fd4f771a04b23c8eb96ee9307b004be81e8da96
2020-04-02 04:50:37 +00:00
Kyunglyul Hyun
f064dcae8e Call MediaRouter2Manager#onTransferred
Call MediaRouter2Manager#onTransferred to notify
whether transfer is succeeded or failed.

Bug: 151396145
Test: atest mediaroutertest
Change-Id: I4331c80d03c61b5a722a8be404c979d3fcfa23f1
2020-04-01 22:38:06 +09:00
Andrii Kulian
5c13904c68 Merge "Report bounds instead of size in WindowMetrics" into rvc-dev am: 363edf449a
Change-Id: I80833bd0256a350662a90c2c4f73b9d1fee9273e
2020-03-27 01:16:24 +00:00
Andrii Kulian
0be1d67b68 Report bounds instead of size in WindowMetrics
Use case: Jetpack WM will use them to get the location of windows on
screen and compute the display feature positions in window coordinate
space.

Bug: 150908045
Test: atest FrameworksCoreTests:WindowMetricsTest
Test: atest CtsWindowManagerDeviceTestCases:WindowMetricsTests
Change-Id: Ia08950cd5df35971408e8b17bb27d97d29d0ab9b
Exempt-From-Owner-Approval: API change
2020-03-24 17:05:50 +08:00
TreeHugger Robot
e147a04661 Merge "MediaRouter: Rename methods in TransferCallback" into rvc-dev am: 9332d217af
Change-Id: I9afd559a2ca20fc43b9d3c19b1d40c38fbfa1317
2020-03-21 03:39:12 +00:00
Kyunglyul Hyun
f4552af502 MediaRouter: Rename methods in TransferCallback
Bug: 151455138
Test: cts test and atest mediaroutertest
Change-Id: I2bfc5c6c4ac6730d1a7162cd9516092ec64d16e7
2020-03-20 23:25:11 +09:00
Automerger Merge Worker
f23b13da86 Rename SampleMediaRoute2ProviderService to StubMediaRoute2ProviderService am: 1c888e2dbb
Change-Id: I9d0f69b50defac9bc8cc488cc6d0880b7cc8929f
2020-03-15 14:35:22 +00:00
Hyundo Moon
1c888e2dbb Rename SampleMediaRoute2ProviderService to StubMediaRoute2ProviderService
Bug: 151538499
Test: atest mediaroutertest
Change-Id: I1467acf7482ac5421b800281e367353f08358eab
2020-03-15 19:52:05 +09:00
Automerger Merge Worker
0a57377073 Merge "EffectsTest: Add multi-threaded client for Visualizer" am: 6fed7a9d16 am: 2d281436d7
Change-Id: I404cf810732b4f2443b6da88b718cd5ee34bf533
2020-03-14 01:06:53 +00:00
Mikhail Naganov
60d2cb7e30 EffectsTest: Add multi-threaded client for Visualizer
Adding a multi-thread client helps to unveil problems
with concurrent use of VisualizerEffect.

Bug: 149375271
Test: enable "Multithreaded Use" in Visualizer Test
Change-Id: Id485790dc7e91fde5dc5844a287645e96f8ec253
2020-03-13 23:02:58 +00:00
Philip P. Moltmann
12ac3f406f Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
2020-03-12 19:26:10 +00:00
Philip P. Moltmann
aea50fc06a Rename featureId -> attributionTag
In the core functionality this changes everything including aidl's and
field names:
- Context
- ContentProvider
- AppOps*
- Package parsing

For the rest, this is a shallow change to only change to the changed
APIs. This keeps the change small-ish

Exempt-From-Owner-Approval: Rename
Fixes: 148792795
Test: TH
Change-Id: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
Merged-In: I2a2245fe76e09e62cb13d5785d2efb4a304ba54a
2020-03-12 11:47:51 -07:00
TreeHugger Robot
abb2d5847d Merge "Camera: Add new hidden API for camera open/close callback" into rvc-dev 2020-03-10 23:27:46 +00:00
Shuzhen Wang
6d76d3b1f6 Camera: Add new hidden API for camera open/close callback
The hidden API is used by SystemUI process to adjust the system UI based
on when a certain camera is opened or closed.

Test: Manually observe callbacks in SystemUI when running camera CTS
Bug: 150540299
Change-Id: I04cae782d96f0e32be8ef588dcd328f84b32887a
2020-03-10 09:35:50 -07:00
Hyundo Moon
f8e49f4bf7 Put requestId first in notifySessionCreated() arguments
For consistency, this CL applies the same changes also to the
internal methods.

Bug: 150922531
Test: CTS and mediaroutertest (Passed except already failing methods)
Change-Id: Iac0ab78464b16212cb3ad46519f5892e8d1b69d9
2020-03-06 23:33:56 +09:00
Kyunglyul Hyun
2dd6d27d4a Merge "Fix RoutingSessionInfo route ID issue" into rvc-dev 2020-03-06 11:27:36 +00:00
TreeHugger Robot
531bb231d8 Merge "Merge notifySessionCreationFailed into notifyRequestFailed" into rvc-dev 2020-03-06 06:52:21 +00:00
Kyunglyul Hyun
5219072963 Fix RoutingSessionInfo route ID issue
In the previous CL, we relied on MediaRouterUtils.getOriginalId()
that returns a wrong ID when it has no provider ID but the separator.

Resolve the issue by resetting route ID in Builder class.

Bug: 150666870
Bug: 150751854
Test: cts test realted to MediaRouter2
Change-Id: Ib17cdc8385308ccadad79e117fcfede72b8af6b5
2020-03-06 13:54:45 +09:00
Hyundo Moon
7c2059c999 Merge notifySessionCreationFailed into notifyRequestFailed
Bug: 150582958
Test: Ran CTS and mediaroutertest
Change-Id: Ica95c7619d85565d49f238b46d3043358c94a37f
2020-03-05 23:10:46 +09:00
Kyunglyul Hyun
fe58399597 MediaRouter2: Fix routes IDs in RoutingSessionInfo
This CL fixes the issue that RoutingSessionInfo#getSelectedRoutes
return improper route IDs when it is recreated.

To ensure provider ID related feature, another test is added.
Since RoutingSessionInfo#setProviderId is a hidden method, the test
is not added to CTS.

The reason for moving "updating route ID logic" into Builder is from
considering use cases.
The original ID of the route is only checked when the provider ID is
set and a route is added to or removed from a RoutingSessionInfo,
which is very rare case.

This CL also fixes the issue that didn't release the previous routing
session when transfer.

Bug: 150666870
Bug: 150751854

Test: atest mediaroutertest
Change-Id: Ic05c11ebf43562b44214eb661c8b9c106f1c9d3e
2020-03-04 20:49:44 +09:00
Kyunglyul Hyun
a3365d7537 MediaRouter: Cleanup MediaRouter2Manager APIs
As a following CL, RoutingController will be removed.
Instead, MediaRouter2Manager will use RoutingSesionInfo.
This CL adds necessary methods for that.

Added Callback#onTransferred and #onTransferFailed.

Bug: 150571233
Test: atest mediaroutertest
Change-Id: If2c23c483f80b6c93a14d1f1f93dfc40463ede1a
2020-03-02 15:02:09 +09:00
Hyundo Moon
899535c9ff Make MediaRouter2 callback classes as abstract
This is per API review.

Bug: 149912538
Test: Ran CTS and atest mediaroutertest
Change-Id: Id52bb7b06da4f414099607b1bde781005e47ded3
2020-02-28 18:27:42 +09:00
Kyunglyul Hyun
ce6a9dc061 Merge "MediaRouter: Define route type" 2020-02-21 02:36:00 +00:00
Hyundo Moon
d882109319 Merge "Add MediaRoute2ProviderService#notifyRequestFailed" 2020-02-21 00:21:46 +00:00
Kyunglyul Hyun
8828c891e0 MediaRouter: Define route type
Change deviceType to type and define more types.
TYPE_GROUP is also added to classify static group routes.

Device type for the default route is set from now

Bug: 149677159
Test: cts test and atest mediaroutertest
Change-Id: I0626efe7b6160f22fe69a0b75368ee1a67d8768c
2020-02-20 21:32:54 +09:00
Kyunglyul Hyun
f55befbfbe MediaRouter2: Fix test bug
Two set of preferred features could be the same in a different order.
Test: atest mediaroutertest
Bug: 149887171

Change-Id: I10f6878ad42cf49f2337d2d69f884038b144df45
2020-02-20 19:59:10 +09:00
Hyundo Moon
0fa60e880b Add MediaRoute2ProviderService#notifyRequestFailed
Bug: 146616547
Test: atest mediaroutertest and CTS
Change-Id: I2b2b95bf0fec070ab24f51bba0c58221e5495460
2020-02-20 17:33:22 +09:00
TreeHugger Robot
7b9eaf2f78 Merge "Tuner Java API: minor changes per API review feedback" 2020-02-19 04:51:07 +00:00
Kyunglyul Hyun
96e4893dbe Merge "MediaRouter2: Clean up APIs" 2020-02-18 02:18:14 +00:00
shubang
c090b6db71 Tuner Java API: minor changes per API review feedback
The feedback is b/149341923

Bug: 149341923
Test: make;
Change-Id: I54f98b2531c73f341ff49d29878e6e30d9d4b105
2020-02-17 16:29:45 -08:00
Ivan Chiang
f5dd8c7faa Merge "Fix isDocumentMimeType issue in MediaFile" 2020-02-17 12:34:08 +00:00
Kyunglyul Hyun
c24317d85e MediaRouter: fix manager test bug
There was a bug that waitAndGetRoutesWithManager returnes
a wrong list of routes that doesn't match the given features.

Test: atest mediaroutertest
Change-Id: Ibd01ba9d20fd5fa922d268998e10b497a88a3b45
2020-02-17 18:11:17 +09:00
Kyunglyul Hyun
3729e9f910 MediaRouter2: Clean up APIs
Rename APIS related to RoutingController.
Specifically,
- requestCreateController is changed to transferTo, which is the only
way to "transfer" that may or may not create a controller.
- ControllerCallback is split into TransferCallback and
(new) ControllerCallback.
- onControllerCreated and onControllerReleased is merged into
onTransferred(old, new)

Rename APIS related to RoutingController.

Bug: 149185558
Test: atest android.media.cts.MediaRoute2InfoTest
  && atest android.media.cts.MediaRouter2Test
  && atest android.media.cts.RouteDiscoveryPreferenceTest
  && atest android.media.cts.RoutingSessionInfoTest
  && atest android.media.cts.MediaRoute2ProviderServiceTest
  && atest mediaroutertest

Change-Id: I348581be7c0b8537da22da3bc81e2ca31e16203f
2020-02-17 16:56:01 +09:00
Kyunglyul Hyun
c943f212a5 MediaRouter2: Remove sendControlRequest
Unused sendControlRequest is removed.
According to that, MediaRouter2ManagerTest is a little bit
modified.

Bug: 145487522
Test: atest cts realted to media router 2
Change-Id: I3c2c5d1c2c67a3398a45bb2fab4e90dcf90f627e
2020-02-17 14:02:48 +09:00
Ivan Chiang
9d0bd71ea9 Fix isDocumentMimeType issue in MediaFile
Bug: 149077289
Test: atest MediaFileTest
Change-Id: I541c32d7e44b852999dd1aefa531e7cd88978bc9
2020-02-17 10:42:59 +08:00
Kyunglyul Hyun
6e0c08b396 MediaRouter2: s/transferrable/transferable/g
It was s/[tT]ransferrable/$1ransferable/g though.

Bug: 149534504
Test: build & atest mr2 related tests
Change-Id: I7b6cbb51993a5f1673e39f590d65e057d9474315
2020-02-14 15:44:18 +09:00
Hyundo Moon
71416f5af6 Merge "Rename MediaRouterManagerTest to MediaRouter2ManagerTest" 2020-02-14 04:37:32 +00:00
Hyundo Moon
e90a28e38a Rename MediaRouterManagerTest to MediaRouter2ManagerTest
Test: atest mediaroutertest
Change-Id: Id3b7f71b6dcc290fcfd20690dda2b928d864373a
2020-02-14 10:47:52 +09:00