Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
492,927 Commits 3 Branches 0 Tags
9bc06b7641f6361fd31cd5227eb94de53170e2c2
Commit Graph

15995 Commits

Author SHA1 Message Date
Amy Zhang
1d80fcf7d1 Merge "Complete the Cas System request/release/update implementation in TRM" into rvc-dev am: aaa8e866d3 
Change-Id: I21e76d3dc60dc10a00b860750c15549bc62667a4
 2020-04-21 19:07:09 +00:00
Amy Zhang
aaa8e866d3 Merge "Complete the Cas System request/release/update implementation in TRM" into rvc-dev 2020-04-21 18:56:39 +00:00
Eric Laurent
b4be113a40 Merge "AudioManager: fix event handler" into rvc-dev am: 81b99eda9b 
Change-Id: I7d06db2868014f5f44f544091e80d72b547ac1d7
 2020-04-21 16:13:49 +00:00
Eric Laurent
81b99eda9b Merge "AudioManager: fix event handler" into rvc-dev 2020-04-21 16:07:15 +00:00
Kyunglyul Hyun
310eb3355f Merge "Use session hints when create a session from MR2Manager" into rvc-dev am: e66ac51ea3 
Change-Id: I6b5b7387030050ed3eeb3ec1a039e19ceccf3d44
 2020-04-21 11:25:32 +00:00
Kyunglyul Hyun
e66ac51ea3 Merge "Use session hints when create a session from MR2Manager" into rvc-dev 2020-04-21 11:17:38 +00:00
Kyunglyul Hyun
ba4888173b Merge "Clear routes when media router manager has no callback" into rvc-dev am: 1bb914e8ec 
Change-Id: I68f63ca17a778b2db785f24d08e15e324c6f64f3
 2020-04-21 08:01:35 +00:00
Kyunglyul Hyun
350d7b427e Clear routes when media router manager has no callback 
This CL clears routes when the last callback of MediaRouter2Manager
is unregistered. By doing this, we can ensure
MediaRouter2Manager#getAvailableRoutes() returns correct routes
during at least a single callback is registered.

A test for the behavior is added as well.

This CL also fixed a bug that unregistering a callback from MediaRouter2
disconnects it when multiple callback is used.

Bug: 153515567
Test: atest mediaroutertest & cts test & manually
 using MediaRouter2Demo and Sample OutputSwitcher to see
 if forgotten BT device is correctly removed.
 (w/o this CL forgotten BT device remains)
Change-Id: I31a5001115f1f163c8971bbd906516551b860252
 2020-04-21 14:58:31 +09:00
Kyunglyul Hyun
f0eb51bc40 Use session hints when create a session from MR2Manager 
When MR2Manager requests to create a routing session, it should pass
session hints to the target provider.
This CL adds a logic that MR2Manager asks media router instance to
get session hints to be passed to the provider.

Bug: 152851868
Test: atest mediaroutertest
Change-Id: Ib421f61f663090c6ed95c8b1a2f7deeb80e5be16
 2020-04-21 14:17:08 +09:00
Eric Laurent
f3a10cd244 AudioManager: fix event handler 
Fix access by reference to listener list outside of
synchronized block by cloning the list.

Bug: 154341343
Test: AudioPolicyTest#testAudioPorts, AudioManagerTest#testVolumeGroupCallback, AudioRoutingTest
Change-Id: I1f0fd62c1894dc0dbb07b01f2fd78899e48b4932
 2020-04-21 01:17:12 +00:00
TreeHugger Robot
4b6f05bbff Merge "Make some minor improvements to MediaFormat" into rvc-dev am: 7c33cc554d 
Change-Id: I49f655fd64678312e878f85ee051e75e3c864473
 2020-04-20 19:50:20 +00:00
TreeHugger Robot
7c33cc554d Merge "Make some minor improvements to MediaFormat" into rvc-dev 2020-04-20 19:37:26 +00:00
Santiago Seifert
2a747f8d53 Make some minor improvements to MediaFormat 
Test: atest CtsMediaTestCases:MediaExtractorTest
Test: atest CtsMediaParserTestCases
Bug: 154524134
Change-Id: Ie1d42b200f13a2ce5292c5a06ee979e8d74bbe43
 2020-04-20 19:37:07 +00:00
Andrei Litvin
f73ba98b10 Merge "Add support for GamePad api in ITvRemoteServiceInput." into rvc-dev am: 7dd4f1afb7 
Change-Id: Ia5f0be7376d99319382a19a617aea679fdc4c38f
 2020-04-20 16:54:25 +00:00
Andrei Litvin
3b92b9682d Add support for GamePad api in ITvRemoteServiceInput. 
Gamepad-specific API is a separtate input path from standard "remote"
service. Specifically it adds:
  - openGamepad that creates a virtual input device with
  gamepad-specific suport
  - send gamepad keys
  - send gamepad axis updates, which support joysticks, analog triggers
  and HAT axis (as an alternative to DPAD buttons).

Bug: 150764186

Test: atest media/lib/tvremote/tests/src/com/android/media/tv/remoteprovider/TvRemoteProviderTest.java

Test: flashed a ADT-3 device after the changes. Android TV Remote
      on my phone still worked in controlling the UI.

Merged-In: I49612fce5e74c4e00ca60c715c6c72954e73b7a3
Change-Id: I49612fce5e74c4e00ca60c715c6c72954e73b7a3
(cherry picked from commit 9b9f556af1)
 2020-04-20 10:42:58 -04:00
Jiyong Park
fe22da569d Merge "Mark some aidl_interface modules as unstable" into rvc-dev am: 28665792a2 
Change-Id: I87f2b5384ad7f82374597a75de4595e380564e55
 2020-04-20 05:23:12 +00:00
Jiyong Park
28665792a2 Merge "Mark some aidl_interface modules as unstable" into rvc-dev 2020-04-20 03:23:06 +00:00
TreeHugger Robot
1b8133f5fe Merge "Tuner JNI: descrambler" into rvc-dev am: c1f78e8c20 
Change-Id: Icea2c96542d0309deebe0ef627b90f4d2acf6072
 2020-04-18 06:44:27 +00:00
shubang
40454dbdcb Tuner JNI: descrambler 
And minor filter changes

Bug: 139308734
Test: mmm
Change-Id: Ibf4ac61476690438f86a93142547f7c80d1375d6
 2020-04-17 21:23:06 -07:00
Amy Zhang
e1e65f18c0 Complete the Cas System request/release/update implementation in TRM 
Test: atest
Bug: 154076250
Change-Id: Ifaf80a3e91807e1b47e780d2b5fd699412e1e7cc
 2020-04-18 01:19:34 +00:00
TreeHugger Robot
7d50a4f8a6 Merge "media: fix OutputFrame.getFormat()" into rvc-dev am: 28ea0461c1 
Change-Id: I495f7de9ed598b79a91330b2baed2a5e3b5255af
 2020-04-17 22:31:18 +00:00
TreeHugger Robot
28ea0461c1 Merge "media: fix OutputFrame.getFormat()" into rvc-dev 2020-04-17 22:07:04 +00:00
Wonsik Kim
bedf6bac62 media: fix OutputFrame.getFormat() 
JMediaCodec::getOutputFormat generates underlying Map object, not the
MediaFormat object proper.

Bug: 152618093
Bug: 154107928
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: I9acddc14b6c4f25cfea616ec9724b7503539688b
 2020-04-17 10:55:19 -07:00
Amy Zhang
1638eb1e28 Merge "Add client Id as the parameter of all the release resources APIs in TRM" into rvc-dev am: 8b28b4b058 
Change-Id: I2042c331c823ec13d99c66a18dee68adf48ca6e2
 2020-04-17 03:52:43 +00:00
Amy Zhang
8b28b4b058 Merge "Add client Id as the parameter of all the release resources APIs in TRM" into rvc-dev 2020-04-17 03:31:43 +00:00
Amy Zhang
2e5801340c Add client Id as the parameter of all the release resources APIs in TRM 
Test: atest com.android.server.tv.tunerresourcemanager
Bug: 150952662
Change-Id: I7a028dfde8d93148f3a4c0dd1a607533f8a7b1a7
 2020-04-16 17:32:59 -07:00
Amy Zhang
039cba11b7 Merge "Complete Lnb update/request/release implementation in TRM" into rvc-dev am: 21095a62eb 
Change-Id: I8fa50485abfc954a88bd2d160f355881e6b51a31
 2020-04-16 23:33:31 +00:00
shubang
67db3c2c3f Tuner FW: handle release frontend am: 2f9cab383b 
Change-Id: Ide884dbb0ccafd339004543f9cc8904623acc9bb
 2020-04-16 23:32:36 +00:00
Amy Zhang
21095a62eb Merge "Complete Lnb update/request/release implementation in TRM" into rvc-dev 2020-04-16 23:26:50 +00:00
TreeHugger Robot
13646bb12e Merge changes from topic "tuner_cts_scanning" into rvc-dev 
* changes:
  Complete Frontend release implementation in TRM
  Tuner FW: handle release frontend
 2020-04-16 23:15:06 +00:00
Wonsik Kim
97a0e98526 media: fix MediaCodec key-value converter am: c3c53cf3e7 
Change-Id: I9d5cebdf398d22826e829307fc29fa1ae712e7c7
 2020-04-16 18:07:32 +00:00
Wonsik Kim
39ddc32517 Merge "media: adjust OWNERS file" into rvc-dev am: 0929c3a87f 
Change-Id: I9992bf2adfbfd618db54bcc8c4914a2abc7684fe
 2020-04-16 18:06:48 +00:00
Wonsik Kim
c3c53cf3e7 media: fix MediaCodec key-value converter 
Bug: 152617514
Bug: 152617342
Bug: 152617976
Bug: 152617895
Bug: 152617259
Test: atest CtsMediaTestCases:MediaCodecBlockModelTest
Change-Id: Ibb8863c79b4f2a722b8c776555539eb5bd4ee519
 2020-04-16 17:58:35 +00:00
Wonsik Kim
0929c3a87f Merge "media: adjust OWNERS file" into rvc-dev 2020-04-16 17:58:15 +00:00
Orion Hodson
18f7afccb6 Merge "Add explicit dependencies on jni_headers" am: c0fe0ae29f am: 6963d8e1c8 
Change-Id: I2fdf3826653466d65e3d63fa896d1ec23c5716cd
 2020-04-16 10:58:50 +00:00
Orion Hodson
6963d8e1c8 Merge "Add explicit dependencies on jni_headers" am: c0fe0ae29f 
Change-Id: I8c84a9de389c0f82c307d835344038373d75f61a
 2020-04-16 10:45:48 +00:00
Orion Hodson
63f06b738d Add explicit dependencies on jni_headers 
Preparation for removing implicit include paths for jni.h from soong.

Also remove unnecessary jni.h includes from PathParser.{h,cpp}.

Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: Ib18afa3d2c93ed3ce69204286d5177991100fd7e
Exempt-From-Owner-Approval: build refactoring
 2020-04-16 08:26:14 +00:00
Amy Zhang
492f8bae66 Complete Lnb update/request/release implementation in TRM 
Test: atest
Bug: 150952662
Change-Id: I14b1e0ef291159ab9da3ed1e4a056317c44467a8
 2020-04-15 21:48:12 -07:00
shubang
2f9cab383b Tuner FW: handle release frontend 
This can unblock tune/scan CTS test cases.
If a frontend resource is acquired in a test case and not released,
it cannot be used by another test case.

Bug: 150952758
Test: atest android.media.tv.tuner.cts.TunerTest
Change-Id: Ib9bab003fc81fe008091a9d1aaefc43e454c3230
 2020-04-15 21:47:29 -07:00
Hyundo Moon
47464a5076 Merge "Prevent MediaRoute2ProviderService#onReleaseSession() from being called twice" into rvc-dev am: f4314e3ae9 
Change-Id: I17cf527c037289ed70cdcba4b92dea046d815abb
 2020-04-15 17:19:19 +00:00
Hyundo Moon
f4314e3ae9 Merge "Prevent MediaRoute2ProviderService#onReleaseSession() from being called twice" into rvc-dev 2020-04-15 06:19:58 +00:00
Eric Laurent
998602811e Merge "AudioManager: Add functional tests for productstrategy/volumegroup" am: 688857ea3b 
Change-Id: I326ac538f6cdf27f56138a9f8abf5f49aa40a097
 2020-04-15 00:33:38 +00:00
Eric Laurent
48b9be33e1 Merge "AudioManager: Add functional tests for productstrategy/volumegroup" into rvc-dev am: 5fb2147af2 
Change-Id: I70963769ee5d6184a7cc34bcb654d76dbd5c15c8
 2020-04-14 22:56:50 +00:00
Eric Laurent
5fb2147af2 Merge "AudioManager: Add functional tests for productstrategy/volumegroup" into rvc-dev 2020-04-14 22:37:19 +00:00
Francois Gaffie
ea96cf2e49 AudioManager: Add functional tests for productstrategy/volumegroup 
Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioProductStrategyTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupChangeHandlerTest com.android.audiopolicytest

Bug: 136121584

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Ia7e92ff37ff9c5e51bc2b5fe54b15c6338868b23
Merged-In: Ia7e92ff37ff9c5e51bc2b5fe54b15c6338868b23
 2020-04-14 19:51:27 +00:00
Francois Gaffie
8650e2d23d AudioManager: Add functional tests for productstrategy/volumegroup 
Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioProductStrategyTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupTest com.android.audiopolicytest
adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupChangeHandlerTest com.android.audiopolicytest

Bug: 136121584

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Ia7e92ff37ff9c5e51bc2b5fe54b15c6338868b23
 2020-04-14 12:48:24 -07:00
Hyundo Moon
d274976b8c Prevent MediaRoute2ProviderService#onReleaseSession() from being called twice 
Bug: 153934282
Test: Checked the logs that the method is called only once
      Also ran CTS / atest mediaroutertest
Change-Id: I0c27ecd5b1c83be241fcebe71a7e0ea9f1c9e349
 2020-04-14 22:22:16 +09:00
TreeHugger Robot
aa2e331b72 Merge "Add Multi Audio focus" into rvc-dev am: 35f960dff4 
Change-Id: I97bda7a1f752557217d3b597a55342b29c63990a
 2020-04-14 06:47:23 +00:00
TreeHugger Robot
35f960dff4 Merge "Add Multi Audio focus" into rvc-dev 2020-04-14 06:29:16 +00:00
Jin Seok Park
d32dd103fd Merge "Ensure thread-safety of SimpleDateFormat" into rvc-dev am: 78552a888a 
Change-Id: I72ee82e19cd2dd9d3121399bf80d4db5f1a3ab4c
 2020-04-14 02:44:45 +00:00