Commit Graph

8719 Commits

Author SHA1 Message Date
TreeHugger Robot
db95fd7845 Merge "Move tuner constants to Tuner.java" into rvc-dev 2020-03-17 17:55:17 +00:00
Hyundo Moon
52a078901b Merge "MediaRouter2: Call onTransferred when Cast -> BT." into rvc-dev 2020-03-17 02:00:25 +00:00
shubang
5290c6200c Remove FrontendSettings.Builder
Bug: 151178281
Test: mmm
Change-Id: If400f8368fe93271bc4ffec76ae16dfc329a1d4a
2020-03-16 16:32:41 -07:00
shubang
2e6954886d Move tuner constants to Tuner.java
Bug: 149786399
Test: make
Change-Id: Ia78a990cc0bbfd0d58399205833412738b110043
2020-03-16 15:53:23 -07:00
Kyunglyul Hyun
923ef0d785 MediaRouter2: Call onTransferred when Cast -> BT.
Let SystemMediaRotue2Provider call notifySessionCreated.

Bug: 151287179
Bug: 151396145
Test: cts test and atest mediaroutertest
Change-Id: Iabd5b9f30a05902f690111da495d61433ea5e43d
2020-03-16 19:26:32 +09:00
TreeHugger Robot
78688bc4e5 Merge changes from topic "handle_per" into rvc-dev
* changes:
  Return handle instead of resource id to the client in trm
  Add TUNER_PERMISSION and DESCRAMBLER_PERMISSION check on related tmr apis
2020-03-16 07:51:36 +00:00
Kyunglyul Hyun
ccd4db5e16 Merge "Add final to MediaRouter2" into rvc-dev 2020-03-16 04:05:10 +00:00
Henry Fang
70d417600c rename getFec() to getInnerFec()
Use right name to indicate what is actually returned.

bug: 151176990
Test: Manual
Change-Id: I3066d6936de0fee5e9c5b1d67964c0854031be0d
2020-03-13 21:15:03 +00:00
Amy
cd0e8ae101 Return handle instead of resource id to the client in trm
Test: atest
Bug: 150952662
Change-Id: I9bb741e4d1328ee44148bf41b3a1e8772272ebfa
2020-03-13 10:06:02 -07:00
Amy Zhang
700c955ffd Merge changes from topic "trm-demux-des" into rvc-dev
* changes:
  Add Descrambler resource management in Tuner Resource Manager
  Add demux resource management into Tuner Resource Manager
2020-03-12 21:45:58 +00:00
Kyunglyul Hyun
9560b62aec Add final to MediaRouter2
Bug: 151309678
Test: cts test
Change-Id: Ibedf0bee0bf38c6b7cbef750aea4a965efcfc1ed
2020-03-12 23:24:10 +09:00
TreeHugger Robot
465dc5b58f Merge "Remove duplicate term in the definition" into rvc-dev 2020-03-12 11:48:54 +00:00
Amy
151fbb6354 Add Descrambler resource management in Tuner Resource Manager
Test: make
Bug: 151186028
Change-Id: I9f00d377c7d63b438026d8ab150c0ff42d6e3bac
2020-03-12 03:07:25 +00:00
Amy
4ebbfb97c1 Add demux resource management into Tuner Resource Manager
Test: make
Bug: 151186028
Change-Id: If477b31c5a7a55d2d323e5c03a7f5edb7f9e720a
2020-03-12 03:07:10 +00:00
TreeHugger Robot
fb60f4e159 Merge "Tuner JNI: split dvr to DvrRecord & DvrPlayback" into rvc-dev 2020-03-11 23:08:30 +00:00
Henry Fang
25b1c3a4ff Remove duplicate term in the definition
bug: 151177468
Test: Manual
Change-Id: I01c175365ac7e48f9cf83ac862ad46f2da386771
2020-03-11 12:25:09 -07:00
TreeHugger Robot
735ed754b9 Merge "Implement Tuner.openLnbByName()" into rvc-dev 2020-03-11 03:01:41 +00:00
shubang
757602f7ed Implement Tuner.openLnbByName()
Bug: 149786702
Test: mmm;
Change-Id: I37fd9dd6ebc15962db70f81887184135974268e1
2020-03-10 17:56:40 -07:00
TreeHugger Robot
abda4964c5 Merge "Tuner API: remove TsFilterConfiguration.Builder" into rvc-dev 2020-03-10 23:32:36 +00:00
shubang
5637a6636c Tuner JNI: split dvr to DvrRecord & DvrPlayback
Bug: 139308734
Test: make; acloud;
Change-Id: Iac1d131663bf1e6b859cd37f629d9ef7c0170184
2020-03-10 15:51:35 -07:00
TreeHugger Robot
f4d115b1c5 Merge "Tuner JNI: FilterCallback" into rvc-dev 2020-03-10 22:29:16 +00:00
Kyunglyul Hyun
dae3eea890 Merge "Add MediaRouter2#stop" into rvc-dev 2020-03-10 11:53:05 +00:00
Kyunglyul Hyun
82f3ed2925 Merge "MediaRouter2: Fix javadoc" into rvc-dev 2020-03-09 03:07:38 +00:00
Hyundo Moon
fde3c9ac59 Merge "Put requestId first in notifySessionCreated() arguments" into rvc-dev 2020-03-09 02:02:12 +00:00
Kyunglyul Hyun
c439bfe783 Merge "Remove MediaRoute2Info.getDeviceType" into rvc-dev 2020-03-09 01:54:48 +00:00
shubang
e68703de00 Tuner API: remove TsFilterConfiguration.Builder
suggested by API Council

Bug: 150243994
Test: mmm;
Change-Id: Ibb0bb29665fc4beefcbcf1dd7a630e6f9a5954bf
2020-03-06 18:51:06 -08: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
50919b97c3 Remove MediaRoute2Info.getDeviceType
The hidden method getType() should be used instead.

Bug: 150925607
Test: run cts test

Change-Id: I6b488a27c20aa3bfd10e9edbd6b4efab91bda22d
2020-03-06 20:43:04 +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
73c9b9f0ea MediaRouter2: Fix javadoc
Add a disclamer and cleanups some comments.
Add a link to AndroidX media router.

Bug: 150291987
Test: N/A
Change-Id: I6ba5505b52a256ac4ee30b087524f2a4263e8df7
2020-03-06 14:41:30 +09:00
Kyunglyul Hyun
508393075c Add MediaRouter2#stop
MediaRouter2#stop stops the current media routing and
invokes the callback onStopped.
According to the change transferTo doesn't accept null route
as its argument.

CTS is changed as well.

Bug: 150472061
Test: CTS tests related to media router2

Change-Id: I6bc7b7ad394189e035e4c018677efb94e5497c85
2020-03-06 14:34:45 +09: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
shubang
be1c41196f Filter changes according to API review
Bug: 150244216
Test: mmm;
Change-Id: I52a7df6bbd8a580a4ea6e8bff4f1ee1515acf3f4
2020-03-06 02:57:12 +00:00
TreeHugger Robot
e4146905d4 Merge "Add callback for codec format changed." into rvc-dev 2020-03-06 01:32:27 +00:00
TreeHugger Robot
6a84d7bef4 Merge "Tuner API: remove @FilterConfiguration.PacketType" into rvc-dev 2020-03-06 00:43:05 +00:00
jiabin
a02129ba9b Add callback for codec format changed.
When initializing a AudioTrack, there will be a IAudioTrackCallback
created systematically in JNI. It will be registered as a callback after
native AudioTrack created. Currently, it is used for notifying codec
format changed.

Bug: 150301890
Test: manual
Test: atest AudioMetadataTest
Change-Id: Ib35749ebbbef2b11b90750663d110430f0ce8390
2020-03-05 14:22:38 -08:00
Amy Zhang
2c2b5a7a0c Merge "Add an Executor to the new acquireTvInputHardware API" into rvc-dev 2020-03-05 18:48:00 +00:00
TreeHugger Robot
c6301c0885 Merge "Remove unnecessary logging" into rvc-dev 2020-03-05 18:13:57 +00: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
Jin Seok Park
dc1fe78978 Merge changes I7c542db9,I6f809ce2 into rvc-dev
* changes:
  [Media ML] Add uid as parameter
  [Media ML] Implement button session management
2020-03-05 09:50:44 +00:00
Kyunglyul Hyun
4e3f08bb16 Merge "MediaRouter2: Fix routes IDs in RoutingSessionInfo" into rvc-dev 2020-03-05 05:15:13 +00:00
TreeHugger Robot
03e1b5a327 Merge "Tuner API: improve the JavaDoc of Dvr" into rvc-dev 2020-03-05 04:47:03 +00:00
shubang
b838fbf8aa Tuner API: remove @FilterConfiguration.PacketType
There are some valid and reserved packet type values, so packet type
should not be enum.

According to specs
ITU-R BT.1869, https://screenshot.googleplex.com/HhktwijUqBF.png
ATSC A/330:2019,https://screenshot.googleplex.com/6ZQdO6HrmAS.png

Bug: 150639580
Test: mmm
Change-Id: Ie879a518635707dc71837fda12d90866faf35dc1
2020-03-04 19:42:24 -08:00
TreeHugger Robot
a7327a5cdc Merge "Tuner API: improve LNB JavaDoc" into rvc-dev 2020-03-05 02:46:52 +00:00
TreeHugger Robot
e5d57d4add Merge "Tuner JNI: Lnb" into rvc-dev 2020-03-05 02:08:08 +00:00
shubang
3e0c37b525 Tuner JNI: FilterCallback
Bug: 139308734
Test: make; acloud;
Change-Id: I1f0b1b401bae833c44a37862eaa0f057d058da87
2020-03-04 17:00:37 -08: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
Jin Seok Park
b40a716a90 [Media ML] Implement button session management
1. Add config values for setting custom dispatcher and provider
class names as @hide APIs.
2. Make MediaSessionService use the custom dispatcher and
provider classes (if they exist) via reflection.
3. Make SessionPolicyProvider/MediaKeyDispatcher abstract classes
and add a default constructor without parameters to make sure it
can be called via reflection.

TODO: Add API for getting/setting policies via MediaSessionManager
once b/149006225 is fixed.

Bug: 147027868
Test: build and manually test
Change-Id: I6f809ce2201cb8fc25d603654148f211a78ea107
2020-03-04 18:35:52 +09:00
shubang
1c1144e298 Tuner JNI: Lnb
Bug: 139308734
Test: make; acloud;
Change-Id: I728cce2a0b5829c5679d2ca806c7ea5dcc0882ae
2020-03-03 18:00:17 -08:00