Commit Graph

8753 Commits

Author SHA1 Message Date
Kyunglyul Hyun
c19b3cc14a MediaRouter: Add features to distinguish audio routes
This CL adds more route features to give
media apps more information.
It also clarifies the values of pre defined route features.

Bug: 152024707
Test: cts test and mediaroutertest

Change-Id: Ia89b45191c4f3fe23210aaca7f336637725fe3b3
2020-03-21 03:04:26 +09:00
TreeHugger Robot
6e72e16da1 Merge "Tuner API: cleanup. Resolve TODOs." into rvc-dev 2020-03-20 07:18:37 +00:00
Jin Seok Park
02e59dd951 Merge "[Media ML] Add get/setSessionPolicies APIs" into rvc-dev 2020-03-20 04:44:09 +00:00
TreeHugger Robot
3fe090f737 Merge "Cleanup Frontend Status" into rvc-dev 2020-03-20 02:44:35 +00:00
shubang
f159a8346b Tuner API: cleanup. Resolve TODOs.
Bug: 139308734
Test: mmm;
Change-Id: I124010e7d042e4ebcca645cb0407c153bca8e32b
2020-03-19 19:43:57 -07:00
TreeHugger Robot
c914081e62 Merge "Fix permission check log in TRM Fix npe in Tuner init" into rvc-dev 2020-03-20 01:05:05 +00:00
TreeHugger Robot
71591b6ba8 Merge "Tuner API: clean up permission check" into rvc-dev 2020-03-20 01:02:57 +00:00
TreeHugger Robot
9f81230589 Merge "Tuner API: remove builder of filter/Settings.java" into rvc-dev 2020-03-20 01:02:44 +00:00
TreeHugger Robot
f75c281d9c Merge "Make ScanCallback methods verbs" into rvc-dev 2020-03-19 23:10:46 +00:00
Amy Zhang
3270b06714 Fix permission check log in TRM
Fix npe in Tuner init

Test: atest TunerTest
Bug: 151186028
Change-Id: I7ce47f30ee8fc8ec280bad1465d2a081e1941044
2020-03-19 22:07:38 +00:00
Wonsik Kim
de9e6f71d0 Merge "MediaCodec: address API review #2" into rvc-dev 2020-03-19 21:46:28 +00:00
Eric Laurent
5eed7459d3 Merge "AudioEffect: add isEffectSupportedForDevice() API" into rvc-dev 2020-03-19 17:57:50 +00:00
shubang
49d8694338 Tuner API: clean up permission check
1. Now permission check is done in system process,
TunerResourceManagerService.
2. Settings or configs classes themselves don't access tuner resouces,
so permission is not necessary. Permissions are checked when they are
used as parameters to access tuner resource. i.e.
openFilter(filterConfig, ...)

Bug: 149785806
Test: mmm
Change-Id: Id0d7a6aa3b8c894acece109885b58f774ab1b024
2020-03-19 17:50:07 +00:00
Jin Seok Park
9fa9b10a98 [Media ML] Add get/setSessionPolicies APIs
This allows vendor/OEMs to dynamically change whether sessions should
be used as buttons sessions or not.

Bug: 147027868
Test: Manually
Change-Id: I9db0d298d5caca0b61b41d94455e8f8f1b1ea685
2020-03-19 19:25:01 +09:00
shubang
d8b040b5a9 Tuner API: remove builder of filter/Settings.java
Feedback from API review.
And other minor changes mentioned in b/150725571

Bug: 150725571
Test: mmm;
Change-Id: I566e8725ed850708313b23c1bec73538aee6844e
2020-03-18 20:52:38 -07:00
Henry Fang
dd394239bb Merge "Fix TODO in tuner.java" into rvc-dev 2020-03-19 00:45:05 +00:00
Nick Chalko
3944be3ad6 Make ScanCallback methods verbs
Bug: 150725571
Test: mmm
Change-Id: I15a94a28d4fc2bbb5a1f11063cb6f06208550d45
2020-03-18 17:43:02 -07:00
Wonsik Kim
637afb2db4 MediaCodec: address API review #2
- Remove GraphicBlock and use HardwareBuffer instead.
- retrieveChangedKeys -> getChangedKeys
- More messages for Exceptions

Bug: 149487982
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I4d19a8dfa6b9f43005c3d3d8ecc840d16aebd356
2020-03-18 17:29:21 -07:00
Andy Hung
6051bff9da Merge "AudioMetadata: Allow vendor keys" into rvc-dev 2020-03-19 00:16:34 +00:00
Nick Chalko
02369e43fb Cleanup Frontend Status
* Rename FrontendStatus.Atsc3PlpInfo to Atsc3PlpTuningInfo
 * FrontendStatus.Atsc3PlpInfo#isLock renamed to isLocked
 * FrontendStatus#isRfLock renamed to isRfLocked

Bug: 150725571
Test: mmm
Change-Id: I93c61b15273882c6e1de7cf2b39e6f2e7103f146
2020-03-18 17:00:26 -07:00
Henry Fang
894da67efa Fix TODO in tuner.java
bug: 150868872
Test: Manual
Change-Id: I1ed920ce23280f3780448894a3fb26153127a754
2020-03-18 16:19:29 -07:00
Andy Hung
96f899f47e AudioMetadata: Allow vendor keys
Test: atest AudioMetadataTest#testVendorKeys
Bug: 151178777
Change-Id: I15197514c39982a314cb0cec9f8b501ba68ed1c4
2020-03-18 13:32:54 -07:00
shubang
76d3623497 Tuner API: modify permission check
1. remove @RequiresPermission of non-static methods since it checks
permission in the constructor.

2. check permission in system process instead of app process, such as:
https://cs.corp.google.com/master-arc-dev/frameworks/base/services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java?type=cs&q=ACCESS_TV_DESCRAMBLER&g=0&l=684

Bug: 149785806
Test: mmm;
Change-Id: I034b5a75f7c8962dbc6c92a573f999a2853082ed
2020-03-18 20:32:10 +00:00
Andrei Litvin
d138fb0ff2 Merge "Merge "Set owners for the tv remote service aidl files." am: 5b5bd31eb3 am: a302148032 am: 7098dee8da am: cf723c35d4 am: df27d42493" into rvc-dev 2020-03-18 19:05:18 +00:00
TreeHugger Robot
48c1ef6e77 Merge "Tuner API: set default values of FilterConfig" into rvc-dev 2020-03-18 17:51:18 +00:00
TreeHugger Robot
9a6e5241eb Merge "Tuner API: set default values of FrontendSettings" into rvc-dev 2020-03-18 17:50:59 +00:00
Andrei Litvin
0816b189f8 Merge "Set owners for the tv remote service aidl files." am: 5b5bd31eb3 am: a302148032 am: 7098dee8da am: cf723c35d4 am: df27d42493
Bug: 150764186

Change-Id: I36584e646c49efabd20a9060d982f9b89b1d66e8
(cherry picked from commit 7f9c3e8a53)
2020-03-18 17:38:40 +00:00
TreeHugger Robot
6332f7786c Merge "Visualizer: Ensure multi-thread safety" into rvc-dev 2020-03-18 05:12:34 +00:00
shubang
a26239b889 Tuner API: set default values of FrontendSettings
Bug: 151178224
Test: mmm
Change-Id: I016bdc918fcec6a90a8ed00a559b666caa12a9af
2020-03-17 17:44:58 -07:00
shubang
117c65ae80 Tuner API: set default values of FilterConfig
Bug: 150243994
Test: mmm
Change-Id: I2a92b0e3105565a0eb43b28be8d112c4125fbd9f
2020-03-17 16:52:59 -07:00
Mikhail Naganov
f8213b3aee Visualizer: Ensure multi-thread safety
Add @GuardedBy annotations and ensure they are met when
doing an ErrorProne build.

Refactored Java code to simplify handling messages
from the native code by using 'Handler.post' with
Runnable instances.

Bug: 149375271
Bug: 151442554
Test: RUN_ERROR_PRONE=true m framework-minus-apex
      check warnings for Visualizer class
Test: run EffectsTest for Visualizer both in single
      threaded and multi-threaded usage scenarios,
      validate there are no lockups in the app
      and no messages from FORTIFY in the log
Change-Id: I50752fad02f2a23ed8d0368b2550dbf7f879a706
Merged-In: I50752fad02f2a23ed8d0368b2550dbf7f879a706
2020-03-17 23:45:02 +00:00
shubang
c18cc10d79 Tuner API: get resources from TRM
and check permissions there

Bug: 149785806
Test: mmm;
Change-Id: I321fe7d97ee406c93ed73dbf440cc045f0b514df
2020-03-17 16:33:44 -07:00
Henry Fang
61abe8ab63 Add java doc to explain the return for insufficient resource.
bug: 151466005
Test: Manual
Change-Id: I21eede6838d70e5dbf0dde9c4ad28059364e107d
2020-03-17 13:17:37 -07:00
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
Eric Laurent
a503025687 AudioEffect: add isEffectSupportedForDevice() API
Add AudioEffect.isEffectSupportedForDevice() @SystemApi
for apps to query if an audio effect can be created and
attached to a particular device without actually calling
the constructor and checking for exceptions.

Bug: 150699608
Test: CTS and GTS Tests for audio effects
Change-Id: Ia03af6114a5cafdc46d5d0cb8130fc0165ca93ac
2020-03-16 13:46:56 -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