Commit Graph

8413 Commits

Author SHA1 Message Date
Nick Chalko
1ef588c5cc Merge "Update documentation for scan commmands" 2020-01-17 15:21:30 +00:00
Kyunglyul Hyun
c6583833d4 Revert "Revert "MediaRouter: add routing controller in MRM""
This reverts commit 7d720f70be.

Reason for revert: Fixed the build issue

Test: atest mediaroutertest

Change-Id: I6cae922d701640a1f43965041c653bd7a61411cb
2020-01-17 20:48:57 +09:00
Orion Hodson
1572fbe6cf Merge "Revert "MediaRouter: add routing controller in MRM"" 2020-01-17 11:10:26 +00:00
Kyunglyul Hyun
7d720f70be Revert "MediaRouter: add routing controller in MRM"
This reverts commit b3dacf3d56.

Reason for revert: Build Fail (ab/6143227)

Change-Id: I456d1ffe4a9760e65f91c37cd67bb9e9daabcc8e
2020-01-17 11:03:28 +00:00
Kyunglyul Hyun
38e8482f6f Merge "MediaRouter: add routing controller in MRM" 2020-01-17 09:43:24 +00:00
Hyundo Moon
dda8cdd510 Merge "MediaRouter2: Add OnCreateSessionListener" 2020-01-17 09:36:07 +00:00
Kyunglyul Hyun
b3dacf3d56 MediaRouter: add routing controller in MRM
This CL introduces RoutingController into MediaRouter2Manager
to enable it to control remote routing sessions.

Tests are also revised according to MRM changes.

Bug: 147787194
Test: atest mediaroutertest

Change-Id: Id4ab61fcb690fccac42df049e1fb74d89bcf3d6a
2020-01-17 15:52:00 +09:00
Hyundo Moon
84e027d63b MediaRouter2: Add OnCreateSessionListener
Bug: 147851996
Test: atest mediaroutertest
Change-Id: If754b5b70123382900c2582c3f126da204488145
2020-01-17 15:06:50 +09:00
Nick Chalko
08d8aca488 Update documentation for scan commmands
Move scan type constants to ScanCallback

Test: m framework-all
Change-Id: I59313e9bb7c1d989cbcdfbce672b7289ed7a0268
Bug: 139308734
2020-01-16 19:47:04 -08:00
TreeHugger Robot
ca878a4c66 Merge "Clean up tuner constants and update according to ag/9977359" 2020-01-17 02:54:38 +00:00
shubang
fbb0a99f40 Clean up tuner constants and update according to ag/9977359
and more minor cleanups

Test: make;
Change-Id: Iaa45289edf53a0c9ec48048e0c6f1cb6caad1bd6
2020-01-16 17:34:21 -08:00
Hyundo Moon
0c179872c5 Merge "Remove route features from RoutingSessionInfo related APIs" 2020-01-17 01:32:14 +00:00
shubang
43a8d48942 Cleanup Tuner.java
Test: make
Change-Id: Ic089bb2a38e2a46482c89e93281bb20c476f3c25
2020-01-16 12:55:27 -08:00
TreeHugger Robot
3c01d0cdfe Merge "Complete FilterConfiguration getters and builders" 2020-01-16 20:29:03 +00:00
Hyundo Moon
dc79a7a8da Remove route features from RoutingSessionInfo related APIs
Bug: 147786965
Test: atest mediaroutertest
Change-Id: I2dcb1a1a40b4d40e3557fd70bcc7111f748886b2
2020-01-17 04:17:10 +09:00
Eric Laurent
46ada44600 Merge "AudioRecord: fix issues with privacy sensitive mode" 2020-01-16 17:23:59 +00:00
TreeHugger Robot
2cd6869482 Merge "MediaRoute2Info: Reorder methods / fields" 2020-01-16 12:32:34 +00:00
Hyundo Moon
0d934524d7 MediaRoute2Info: Reorder methods / fields
Changes the order of methods / fields (important ones first)
Also, this CL adds some missing javadoc.

Bug: 147467641
Test: atest mediaroutertest
Change-Id: I80852bf3a7e2624c8ded1c29440a274709c6f393
2020-01-16 14:33:17 +09:00
shubang
341508ff3a Clean up FrontendCapabilities, FrontendInfo, and FrontendStatus
Test: make
Change-Id: I3e4413071056b7cd5ca1017a6f3296e2f6e5cc22
2020-01-15 20:48:20 -08:00
shubang
4eda97f10e Complete FilterConfiguration getters and builders
Based on ag/10091687 and modified according to ag/9977359

Test: make
Change-Id: Ib1946e0af0487d361605eb9024c0a6a73caf282c
2020-01-15 19:43:46 -08:00
shubang
b976620311 Complete FrontendSettings
Builder, getters, constants, etc

Test: make;
Change-Id: I87e469709d80b61c1ec8c2d89a2d4168d3178220
2020-01-15 11:27:53 -08:00
TreeHugger Robot
7f437bb343 Merge "Move Callbacks" 2020-01-15 06:50:29 +00:00
Kyunglyul Hyun
77b46edc46 Merge "MediaSession: Add volumeControlId in MediaCotnroller.PlaybackInfo" 2020-01-15 05:27:27 +00:00
TreeHugger Robot
e2b62e4f12 Merge changes I8cfea8ab,I349611e3
* changes:
  Recover from HAL death in sound trigger
  Lint cleanup
2020-01-15 03:49:48 +00:00
Hyundo Moon
38ada9b3d5 Merge "Add RoutingController#toString()" 2020-01-15 00:18:55 +00:00
Ytai Ben-Tsvi
c2327e78fd Recover from HAL death in sound trigger
Added some recovery code for the case of a dead driver.
Due to the sound trigger HAL process being tied to the audio server
via init.rc, this would also offer recovery from audio server death
as a by-product.

Bug: 146852437
Change-Id: I8cfea8ab108d482592c8094e8093066973f43288
2020-01-14 15:22:18 -08:00
TreeHugger Robot
18901e2ff9 Merge "MediaRoute2Provider: Revisit session related APIs" 2020-01-14 22:13:47 +00:00
Hangyu Kuang
f986ae1a8e Merge "Skeletal implementation of a MediaTranscodeManager API with corresponding JNI layer." 2020-01-14 21:26:40 +00:00
TreeHugger Robot
fa5f53f589 Merge "AudioPolicy: catch exceptions on unregister" 2020-01-14 20:54:24 +00:00
Hyundo Moon
6e30f1ba9a MediaRoute2Provider: Revisit session related APIs
Bug: 147583303
Test: atest mediaroutertest
Change-Id: I5fbc9d9265607bb8f48a2ca16708dbb0d4979501
2020-01-14 14:51:54 +00:00
Hyundo Moon
153042a903 Add RoutingController#toString()
This can be useful for debugging purposes.

Test: builds successfully / checked the message locally
Change-Id: I8928e131adf6e470309c2165343e8c467d3a692c
2020-01-14 14:51:23 +00:00
Kyunglyul Hyun
bef875cd04 MediaSession: Add volumeControlId in MediaCotnroller.PlaybackInfo
This CL adds API to get/set volume control ID for a session.

Volume control ID is set by volume providers (e.g. MediaRouter)
to notify which volume provider is used by the session
to other apps such as System UI, Settings.

Bug: 147528363
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest

Change-Id: I9ecafeca8b5090b4c8a89029d1e6411fd48919cb
2020-01-14 20:37:08 +09:00
shubang
9534f8ab49 Move Callbacks
Test: make
Change-Id: I560d1ba7db40bb18da0df63cef33189492523e9f
2020-01-13 21:49:48 -08:00
TreeHugger Robot
e27db5d388 Merge "Create ScanCallback" 2020-01-14 04:31:10 +00:00
TreeHugger Robot
1dad0a01ae Merge "Unhide FilterConfiguration part 1" 2020-01-14 03:14:29 +00:00
Amy Zhang
6fb253f441 Merge "Add API getClientPid in ITvInputManager.aidl" 2020-01-14 01:34:04 +00:00
Eric Laurent
64ed2ec38a AudioRecord: fix issues with privacy sensitive mode
Fix two issues with privacy sensitive mode implementation:
1) default applied by AudioAttributes based on source could
override explicit flag set.
2) when privacy mode was explicitly set in AudioRecord builder,
the audio source was reset.

Bug: 137850106
Test: CTS test for AudioRecord
Change-Id: I73f69d3d214102dcc237cac616c9bfc3f85b288e
2020-01-13 17:23:15 -08:00
Nicholas Ambur
9e3ec9af07 Merge "add version entry to soundtrigger model database" 2020-01-14 00:47:20 +00:00
shubang
c7b99ba08c Unhide FilterConfiguration part 1
Test: make;
Bug: 139308734
Change-Id: I8aeeb76cf226aeeb7fee8b27532e502f311e07e1
2020-01-13 15:17:15 -08:00
Jean-Michel Trivi
61677938c4 AudioPolicy: catch exceptions on unregister
Make the synchronous AudioManager.unregisterAudioPolicy() method
compatible with situations where the owner of the policy has already
stopped / flushed the tracks or recorders associated with the policy
by catching the IllegalStateException that could be thrown.

Test: atest AudioServiceHostTest#testGetDevicesForAttributes
Change-Id: Ic0ae0732b775a10135f6cbdd31d5e3409e550942
2020-01-13 13:47:31 -08:00
Nicholas Ambur
d3ec82fbc4 add version entry to soundtrigger model database
Bug:147159435
Test: manual hotword trigger with upgraded database
&& dumpsys voiceinteraction

Change-Id: I45497c1159fe879e1de119a18aac8f7ecc2b0686
2020-01-13 12:23:56 -08:00
Amy
cee45f10e1 Add API getClientPid in ITvInputManager.aidl
This API is for TunerResourceManager to get the callingPid of a TIS
client from TIF with the sessionId provided by TIS when TIS requests
resources from the TunerResourceManager.

This CL is also handling the creating and storing mechanism of the
sessionId.

The sessionId is provided by TIF when TIS created session through
TIF.
The sessionId to clientPid mapping is saved in a global map
in TIF service.
It is passed to the vendor TIS through new public API
onCreateSession(inputId, sessionId)/onCreateRecordingSession(inputId,
sessionId).

Test: Run with CTS on Cuttlefish
Bug: 147380882

Change-Id: I344a812add4a9637bf7eb226e5e4e3ead5b456a2
2020-01-13 12:00:08 -08:00
TreeHugger Robot
89f78f9a4c Merge "Unhide LNB methods and constants" 2020-01-13 07:09:38 +00:00
Hyundo Moon
fb905f7ea9 Merge "Rename RouteSessionInfo and RouteSessionController" 2020-01-13 01:48:38 +00:00
TreeHugger Robot
ca04bdddbf Merge "Clean up Descrambler" 2020-01-12 23:47:03 +00:00
shubang
332b04b5dc Clean up Descrambler
Test: make;
Change-Id: I5b8a295234300b3d5ec165c856103b453eb4425d
2020-01-12 14:29:50 -08:00
Nick Chalko
6f886056d0 Merge "Mark @NonNull where possible in TvTrackInfo" 2020-01-12 05:53:34 +00:00
Nick Chalko
63cdbb59f1 Mark @NonNull where possible in TvTrackInfo
Test: m framework-minus-apex
Change-Id: I4acdb1c9871ee71294e2ebfec2c7444de95861b7
Bug: 112835103
2020-01-12 05:53:07 +00:00
Nicholas Ambur
55c162edcd Merge "add audioCapabilities to SoundTrigger properties" 2020-01-11 16:39:55 +00:00
Hyundo Moon
f829e6f1d6 Rename RouteSessionInfo and RouteSessionController
This CL renames following classes:
 - RouteSessionInfo to RoutingSessionInfo
 - RouteSessionController to RoutingController

Bug: 147527788
Test: atest mediaroutertest
Change-Id: I6d6c997d9119b668bd8879f2f5a8ca266ddbeccc
2020-01-11 19:56:37 +09:00