Commit Graph

8860 Commits

Author SHA1 Message Date
Andy Hung
59dffec3f1 AudioTrack: Add Tuner Configuration methods
Test: atest AudioTrackTest#testTunerConfiguration
Bug: 133526565
Change-Id: I0cc8e9e8b780e1a87c38656c8dfc67dac03969d8
2020-01-16 12:30:26 -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
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
shubang
aa84eb46de Mark DemuxCapabilities @SystemApi
Test: make;
Bug: 139308734
Change-Id: I3bec8e69398d2fcab02b238cbd45854368300345
2020-01-15 15:21:00 -08:00
shubang
b976620311 Complete FrontendSettings
Builder, getters, constants, etc

Test: make;
Change-Id: I87e469709d80b61c1ec8c2d89a2d4168d3178220
2020-01-15 11:27:53 -08:00
Marco Nelissen
0b291937b4 MediaMetadataRetriever: parse genre tags
When the genre tag is numeric, return a human readable string instead
of the raw numeric tag.

Bug: 141520122
Test: CTS
Change-Id: Ida0d48171e1400b87940e4e38aa07d2fdd5a77ed
2020-01-15 07:37:27 -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
Artur Satayev
53ada2ab28 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Merged-In: I853372f3c6fef905553bb31be4f1bb48df735f7a
Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
2020-01-14 15:54:55 +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
Hyundo Moon
459dee33df RouteSessionInfo: Remove isValid() and override equals()/hashCode()
This CL removes RouteSessionInfo#isValid() since there is are no usages.
Also overrides equals() and hashCode().

Also, it applies following changes:
 - Make the class as final
 - Add javadoc for using an empty string for unknown client package name
 - Throw exception in Builder#build() if there is no selected routes.
 - Throw IllegalArgumentException in Builder#add/Remove*Routes(routeId)
   when the given routeId is empty or null.

Tests for the class are also added.

Bug: 147524068
Test: atest mediaroutertest
Change-Id: I2cb6cc37a8216dd42dc72edee72bb5211259c66a
2020-01-11 19:47:35 +09:00
Kyunglyul Hyun
616096e8d0 Unhide MediaRouter2 and MediaRoute2ProviderService
This CL covers APIs for discovering routes published by
MediaRoute2ProviderService.

Bug: 147402721
Test: atest mediaroutertest
Change-Id: I978a6489ae1bcfcd6bb427d4a939c49ff3420e2d
2020-01-11 16:09:35 +09:00
TreeHugger Robot
2dbacb6ca4 Merge "Add SystemApi for querying audio routing" 2020-01-11 03:10:52 +00:00
TreeHugger Robot
8d7ac68bd9 Merge "Clean up DVR class" 2020-01-11 02:14:48 +00:00
TreeHugger Robot
6151a691aa Merge "Complete filter event classes" 2020-01-11 01:46:41 +00:00
shubang
23ec2f958d Clean up DVR class
Test: make
Change-Id: Iaf847955b999302661c686e30dd61f1e2d98344e
2020-01-10 17:04:10 -08:00
TreeHugger Robot
797e6e3905 Merge "Move TimeFilter to filter package" 2020-01-11 01:03:23 +00:00
TreeHugger Robot
811e352d3d Merge "Clean up DvrSettings" 2020-01-11 00:51:25 +00:00