Commit Graph

8772 Commits

Author SHA1 Message Date
TreeHugger Robot
6ae19bbdc2 Merge "Differentiate the default route with the device route" into rvc-dev 2020-03-27 15:50:55 +00:00
Jean-Michel Trivi
5897ede327 Merge "Address Audio Java API feedback" into rvc-dev 2020-03-27 14:58:53 +00:00
Sungsoo Lim
ddf140da12 Differentiate the default route with the device route
Default route denotes the route that will be selected by
SystemMediaRoute2Provider by default. While the device route denotes the
route that is currenctly active among the phone speaker and wired headsets.

Also, some variables and methods are renamed for readability.

Bug: 149796428
Test: pass MR2 tests
Change-Id: I9133bb106ce6b509147e5f837cc30f229a762088
2020-03-27 15:08:32 +09:00
Andy Hung
120c1c4db7 Address Audio Java API feedback
Test: atest AudioTrackTest#testCodecFormatChangedListener
Test: atest AudioTrackTest#testTunerConfiguration
Test: atest AudioMetadataTest
Test: atest EnumDevicesTest
Bug: 152348569
Change-Id: I1c702781f6d3189b98c6b91a14f084333ce16848
2020-03-26 17:11:47 -07:00
Eric Laurent
e9e26309fd AudioProductStrategy: fix attributesMatches()
Use AudioAttributes.getSystemUsage() instead of getUsage()
when comparing attributes as getUsage() defaults to UNKNOWN for
system usages and causes a false match.

Bug: 136121584
Test: build & run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
Change-Id: I377e840b18443c33fb0b562b27fbc706aaeb8055
2020-03-26 19:24:16 +00:00
TreeHugger Robot
6414fb0655 Merge "Tracking legacy remote submix active or not in RecordingActivityMonitor." into rvc-dev 2020-03-25 21:49:32 +00:00
jiabin
9bad0e947f Tracking legacy remote submix active or not in RecordingActivityMonitor.
When enabling Live Caption, remote submix device will be set as fixed
and full volume device in audio service. In that case, volume control
for remote submix will not be forwarded anymore. However, it is expected
to have volume control when the device is on chromecast mirror mode.
To solve the problem, tracking legacy remote submix device is active or
not in RecordingActivityMonitor. When legacy remote submix device is
active, remote submix will not be treated as fixed/full volume device.
In audio policy manager, the remote submix that is used by dynamic
policy will still be fixed volume device.

Bug: 144063329
Test: repo steps in bug
Change-Id: I1cb83c17f34e636763bb989e37ac8e021217cc39
Merged-In: I1cb83c17f34e636763bb989e37ac8e021217cc39
2020-03-25 17:04:49 +00:00
TreeHugger Robot
968b1066e5 Merge "MediaCodec: LinearBlock API for optional crypto" into rvc-dev 2020-03-25 01:10:27 +00:00
Jean-Michel Trivi
5523d8ee4e Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING" into rvc-dev 2020-03-24 23:44:43 +00:00
Jean-Michel Trivi
6abd17edc8 MediaCodec: LinearBlock API for optional crypto
Split setter for LinearBlock in QueueRequest between:
- setLinearBlock for unencrypted streams
- setEncryptedLinearBlock with non-null crypto info

Bug: 149487982
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I7d147b3963febeb431b268262343c782f2c1e3e9
2020-03-24 15:22:01 -07:00
Jean-Michel Trivi
f049197e3c setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING
AudioService: make setWiredDeviceConnectionState enforce the
privileged MODIFY_AUDIO_ROUTING permission

Bug: 151240738
Test: verify plug/unplug headset is WAI
Change-Id: Icde5c2fdfa970baf596d00f808dca8300be8743f
2020-03-24 09:20:50 -07:00
shubang
a06cfe55d6 Tuner JNI: filter impl
Bug: 139308734
Test: make;
Change-Id: Ide7ba5316537152e410f739af884f97f173a4b7c
2020-03-23 19:31:21 -07:00
TreeHugger Robot
9332d217af Merge "MediaRouter: Rename methods in TransferCallback" into rvc-dev 2020-03-21 03:37:02 +00:00
TreeHugger Robot
ae5b29f609 Merge "MediaRouter: Add features to distinguish audio routes" into rvc-dev 2020-03-21 01:01:53 +00:00
TreeHugger Robot
100012bd1c Merge "replace @see with @link to fix java doc error." into rvc-dev 2020-03-20 22:16:36 +00:00
Andy Hung
8bd3d10127 Merge "AudioTrack: Update Tuner API" into rvc-dev 2020-03-20 19:50:28 +00:00
Henry Fang
709c0a9cec replace @see with @link to fix java doc error.
bug: 151966188
Test: Manual
Change-Id: I23edf4851a9eb472104068410a406a0301b43e5c
2020-03-20 11:59:38 -07:00
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
Andy Hung
7d77d7ea8f AudioTrack: Update Tuner API
Move Tuner specific methods to SystemApi
to match Tuner Api visibility.

Update return value annotation on getters.

Test: AudioTrackTest#testTunerConfiguration
Bug: 151178170
Change-Id: I5461d62db38cd912b5896b9c27fd1fef29306bae
2020-03-20 10:26:59 -07: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
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