Commit Graph

9090 Commits

Author SHA1 Message Date
Treehugger Robot
e6a446b45f Merge "Cache stream volumes to prevent ANR" am: db50d542af am: 5219ee1e7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1740f6a49c9ffabd3d011a1dfc7b691da25621f0
2021-01-11 13:06:25 +00:00
Sungsoo Lim
96d134d75a Cache stream volumes to prevent ANR
MediaRourter uses main thread for internal operations, and ANR could
happens if AudioService is not running when MediaRouter tried to get
stream volumes. This CL avoids such ANR by caching stream volumes.

Bug: 170327593
Test: manually
(cherry picked from internal master branch)

Change-Id: I7c00b26a3a25f17c877d3ec0e998905ab0b4af28
2021-01-11 10:04:08 +09:00
Nick Moukhine
ee3b4eda77 Merge "Add owners file for musicrecognition packages" am: 73218cd5b2 am: 9098ad18a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9eb9f35613ff4f7f990aab0b9fddf72631fb74cd
2021-01-08 16:40:15 +00:00
Treehugger Robot
35028e9f0b Merge "Set max frequency as Max_Value of integer if it's negative." am: 4a17bccf59 am: 30f0456d60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02cfbd754a58d7af4010b8885463cba628c89809
2021-01-08 10:13:47 +00:00
Nick Moukhine
06f96289be Add owners file for musicrecognition packages
Bug: 158194857
Test: none (trivial)
Change-Id: I5fe0c211b9835dac6ad5960ffd17cbefee26a10d
2021-01-08 10:56:02 +01:00
Henry Fang
7112714a90 Set max frequency as Max_Value of integer if it's negative.
bug: 176097540
Test: Manual
Change-Id: I17cdd3b2861415b4812694d79aa97f3e7463e12a
2021-01-08 00:37:11 +00:00
Treehugger Robot
27f9f37c0b Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f am: 5e5716ef83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id177580f106509fab9ec6e706ed9a80b11dd16dc
2021-01-07 17:45:06 +00:00
Treehugger Robot
86b6f66d9f Merge "MTP: Update language to comply with Android's inclusive language guidance" 2021-01-07 15:23:53 +00:00
Henry Fang
439f57ac9d Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: c8af272fb6 am: f2a1790db8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I266071322bc21ed4cd60ee33ea8b9b76ca2347cb
2021-01-07 01:55:59 +00:00
Henry Fang
c8af272fb6 Merge "TvProvider API standardization for ARIB and DVB TvProvider" 2021-01-07 00:30:05 +00:00
Henry Fang
93d480caf9 Merge "Don't open frontend device if it's a shared frontend" am: 8212f52f44 am: 1b42f73abd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66e53b800b259f49cc38b814fdd00f0c0765342a
2020-12-31 01:23:56 +00:00
Henry Fang
8212f52f44 Merge "Don't open frontend device if it's a shared frontend" 2020-12-31 00:31:08 +00:00
Treehugger Robot
0a9f4b4ff0 Merge "Support blink scan" am: 1d4bf166d4 am: c067dc9979
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538201

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb3e92354bb34dc4503e69628e338dd0e61ea152
2020-12-31 00:30:32 +00:00
Treehugger Robot
dd7204ab61 Merge "Change resource claim to sync to avoid resource conflict" am: f8d7645571 am: 7155480d5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If829fdf572306852ce0fda685cfb620836f87298
2020-12-31 00:29:53 +00:00
Treehugger Robot
1ee34508c3 Merge "Add thread protection for Filter/Descrambler table Use weak reference in the tables to allow objects released by caller" am: d7275581e1 am: 6a62906e48
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538202

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92a0c19883ba4ea1eccee6a0abe4cdd6aa25c7b3
2020-12-31 00:29:19 +00:00
Treehugger Robot
1d4bf166d4 Merge "Support blink scan" 2020-12-30 23:17:56 +00:00
Treehugger Robot
f8d7645571 Merge "Change resource claim to sync to avoid resource conflict" 2020-12-30 23:16:54 +00:00
Henry Fang
3d9490c218 Don't open frontend device if it's a shared frontend
bug: 175255961
Test: manual
Change-Id: Ib8c9704ebd1c518a84b8526172ca2fe3d087db87
Merged-In: Ib8c9704ebd1c518a84b8526172ca2fe3d087db87
2020-12-30 18:56:58 +00:00
Henry Fang
06eab7931a Add thread protection for Filter/Descrambler table
Use weak reference in the tables to allow objects released by caller

bug: 174685399
bug: 174711353
Test: manual
Change-Id: I760d0a77ad9efe2709a14f0fb8a669f8f16652e1
Merged-In: I760d0a77ad9efe2709a14f0fb8a669f8f16652e1
2020-12-30 18:50:58 +00:00
Henry Fang
49c7e865d7 Support blink scan
Allow scan again if callback and executor are same as before.

bug: 173239634
Test: atest -c TunerTest
Change-Id: Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea
Merged-In: Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea
2020-12-30 18:43:52 +00:00
Henry Fang
0dbb710556 Change resource claim to sync to avoid resource conflict
bug: 174544018
Test: manual
Change-Id: Ib2688da2a85cdad896f9f2814828ce7659c8a695
Merged-In: Ib2688da2a85cdad896f9f2814828ce7659c8a695
2020-12-30 18:41:13 +00:00
Treehugger Robot
1f07b60a75 Merge "Release resource before send MSG_RESOURCE_LOST message to TIS" am: eb709b6d88 am: acb16468cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b2b70e789fd7e2247d246d1c4718d971e791cdc
2020-12-30 12:22:57 +00:00
Treehugger Robot
eb709b6d88 Merge "Release resource before send MSG_RESOURCE_LOST message to TIS" 2020-12-30 11:38:59 +00:00
shubang
150c5afd80 Release resource before send MSG_RESOURCE_LOST message to TIS
Bug: 163397430
Test: mmm
Change-Id: I68e0c8704030e2a5713a5b63cffe8a1fb40873fc
Merged-In: I68e0c8704030e2a5713a5b63cffe8a1fb40873fc
2020-12-29 20:14:47 +00:00
Eric Laurent
b4d0c3785e Merge changes from topic "comm_routing" am: 8553f77dce am: 10c6362030
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534433

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8c5ace4fd7636db42e14523557604fb5d80542a
2020-12-23 13:31:28 +00:00
Eric Laurent
cb629524ec AudioManager: Add communication device management APIs am: f39726f262 am: 890a5d474c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534432

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I525bc7d9040f15eb3c60c47ed10629f7d433b660
2020-12-23 13:31:25 +00:00
Eric Laurent
54e6b9c79b Merge "Support set/clear/get preferred device for capture preset." am: 617d14954d am: db95172696
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534430

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ff104b7e0aab924ff51950b41ce63ec3a742f3
2020-12-23 09:44:49 +00:00
Eric Laurent
d88b1e45b6 Audio: use preferred device for strategy for communication route
Replaced use of forced usage for communication by set preferred device
for strategy to control communication route in audio policy manager.

Also do not use forced usage for record which was redundant with forced
usage for communication.

Bug: 161358428
Test: audio smoke tests

Change-Id: I665257fc5903b663096104b0424781d9799635a5
Merged-In: I665257fc5903b663096104b0424781d9799635a5
2020-12-23 08:36:39 +00:00
Eric Laurent
f39726f262 AudioManager: Add communication device management APIs
Add new APIs to manage the audio device used for communication
use cases (Cellular calls, VoIP and Video calls).
These APIs are meant to replace specific APIs like setSpeakerPhoneOn()
and provide a single generic way of configuring the audio device selected
for calls.
They will be used for newly added device types (e.g. BLE audio) instead
of adding new specific APIs.
They will also offer more options like for instance allowing to select the
earpiece (handset) device when a wired headset is connected.
The new APIs are:
 - boolean setDeviceForCommunication(AudioDeviceInfo)
 - void clearDeviceForCommunication()
 - AudioDeviceInfo getDeviceForCommunication()

A listener is also added for applications to monitor current communication
device selection:
- OnCommunicationDeviceChangedListener
As well as listener registration and unregistration APIs:
- addOnCommunicationDeviceChangedListener()
- removeOnCommunicationDeviceChangedListener()

Bug: 161358428
Test: make && atest AudioCommunicationDeviceTest
Change-Id: I8028d842e4a8ca1abe0f87d03e3c5d57c46b9362
Merged-In: I8028d842e4a8ca1abe0f87d03e3c5d57c46b9362
2020-12-23 08:36:12 +00:00
Jiabin Huang
a6421faaac Support set/clear/get preferred device for capture preset.
Support set/clear/get preferrd device for capture preset. The preferred
device will be used for audio routing when it is availabled. The
preferred device doesn't need to be present when setting.

Bug: 160352965
Test: atest AudioServiceTest
Test: atest AudioServiceHostTest
Test: atest CarAudioZonesHelperTest

Change-Id: Ib7aa142ad4c56a8138c7b440e8efbbf7a7ee38a6
Merged-In: Ib7aa142ad4c56a8138c7b440e8efbbf7a7ee38a6
2020-12-22 18:54:15 +00:00
Eric Laurent
6bacac852a Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534429

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31f00d038a87383f5a5ee6e4ba0d02baff0e31a
2020-12-22 17:26:34 +00:00
Eric Laurent
5ed16d5baa Merge "audio: modify media JNI and audio service test OWNERS" am: 70544c6a7b am: 1f4fff0881
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535141

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d56196500190868fbbbcbe395e04047a2be909e
2020-12-22 17:25:37 +00:00
Eric Laurent
7f73ba815a Merge "Introduce device(s) role for strategy." 2020-12-22 17:11:45 +00:00
Eric Laurent
9c2bace739 audio: modify media JNI and audio service test OWNERS
Add OWNERS file to services/tests/servicestests/src/com/android/server/audio
and add jmtrivi@google.com to media owners file.

Test: N/A
Change-Id: If446eb3f2de07ab1cb3e87715b964a9360ec684c
2020-12-22 15:16:46 +01:00
jiabin
9bb4798296 Introduce device(s) role for strategy.
Adding interface for set/remove/getDevicesRoleForStrategy. This will be
used for setting device(s) role, such as preferred, for strategy.
Set/remove/getPreferreDeviceForStrategy are reimplemented by calling
the new interfaces.

Test: atest AudioHostTest
Test: atest AudioServiceHostTest
Test: atest AudioServiceTest
Test: atest audiopolicy_tests
Bug: 160352965
Change-Id: I2ba02c6b50af80846a25010ead05c4ae364868de
Merged-In: I2ba02c6b50af80846a25010ead05c4ae364868de
2020-12-21 17:01:20 +01:00
Kyunglyul Hyun
b8709b7fc8 MediaRouterService binds services when necessary am: 56bc779553
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13224013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I657a04858f8a7e0d181bb8bf667d00f6e311e178
2020-12-21 08:59:29 +00:00
Kyunglyul Hyun
56bc779553 MediaRouterService binds services when necessary
MediaRouterService maintained bindings to provider services
once those are established.

With this CL, it only binds services when there is a non-empty
discovery preference set by a foreground app or an app is casting.

This change may break output switcher, which enables transfer media
of background apps.

To alleviate that MediaRouter2Manager#startScan and #stopScan are added
so that system UI can force the service bind to the services and find
remote devices to cast.

Bug: 169575701
Bug: 172920557

Test: manually and CTS
Change-Id: I4a47fdb1c9fe05a04d26950485833c9cbfb91a69
(cherry picked from commit 9f889ca4e6)
(cherry picked from commit 602b168f99)
2020-12-21 00:34:16 +00:00
Junichiro.Homma
f56193551f TvProvider API standardization for ARIB and DVB TvProvider
API standardization and customization for Digital Tuner TV
Input support.
(Channels.COLUMN_COLUMN_REMOTE_CONTROL_KEY_PRESET_NUMBER,
Channels.COLUMN_SCRAMBLED, Channels.COLUMN_VIDEO_RESOLUTION,
Channels.COLUMN_CHANNEL_LIST_ID, Channels.COLUMN_BROADCAST_GENRE)

Bug: 158236748
Test: Manual - confirm tv.db
Change-Id: Id0003b7312327de42a18352a7868eaaa3c1ebcc4
2020-12-18 17:01:18 +09:00
Eric Laurent
22bf2895bb Merge "Add package name when initializing SoundPool." into rvc-qpr-dev-plus-aosp 2020-12-18 07:26:22 +00:00
jiabin
181d26b7e5 Add package name when initializing SoundPool.
The package name is useful for permission validation. Currently, package
name is required when starting external vibration so that the vibrator
service can verify if the app has the permission to start vibration.

Bug: 175595599
Test: SoundPool tests in cts
Test: play audio-coupled-haptic file using SoundPool.
Change-Id: Ibfe414063a303118a5bb393d65ea5dc2323bf722
Merged-In: Ibfe414063a303118a5bb393d65ea5dc2323bf722
(cherry picked from commit de9005bab1)
2020-12-18 07:23:04 +00:00
Wonsik Kim
3fa9158be7 MediaCodecInfo: do not alter performance points for 32-bit processes
Bug: 173488434
Test: atest CtsMediaTestCases:MediaCodecListTest
Change-Id: Ie40557dc0401411cc51650ea42c0fd75f90c67ce
2020-12-17 10:51:17 -08:00
jiabin
946d9f1d21 Add package name when initializing SoundPool.
The package name is useful for permission validation. Currently, package
name is required when starting external vibration so that the vibrator
service can verify if the app has the permission to start vibration.

Bug: 175595599
Test: SoundPool tests in cts
Test: play audio-coupled-haptic file using SoundPool.
Change-Id: Ibfe414063a303118a5bb393d65ea5dc2323bf722
Merged-In: Ibfe414063a303118a5bb393d65ea5dc2323bf722
(cherry picked from commit de9005bab1)
2020-12-17 13:46:17 +00:00
James Wei
bbf55a3fcd MTP: Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=162536543

Change-Id: Ide3483e78ce66deb9bdda2a0d54feb8f70748832
2020-12-15 01:20:23 +00:00
Treehugger Robot
41ac3bae5f Merge "MediaCodecInfo: limit resolution to 4K for 32-bit processes" 2020-12-14 06:09:09 +00:00
Wonsik Kim
ef60b5fa00 MediaCodecInfo: limit resolution to 4K for 32-bit processes
Due to the limited virtual memory address space it is not practical
to advertise support for more than 4K for 32-bit processes.

Bug: 173488434
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Ibcd7f70f4efd8d696d831769bafe932207640830
2020-12-11 16:21:47 -08:00
Serik Beketayev
c6218f7977 Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc0a49e76f87a741f4410b53e9a40012e37fde36
2020-12-10 00:08:03 +00:00
Serik Beketayev
a086c295e7 Merge "[Mainline Migration] Migrate NetworkUtils" 2020-12-09 23:47:05 +00:00
Jeff Sharkey
c7c4a74a78 Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0211462ecbcd9ad66f66af87e31cf12e1582fc65
2020-12-08 16:01:16 +00:00
Jeff Sharkey
c2793cf12b Merge changes from topic "dec5"
* changes:
  Improve OWNERS coverage across frameworks/base/.
  Improve OWNERS coverage across frameworks/base/.
  Improve OWNERS coverage across frameworks/base/.
2020-12-08 15:39:59 +00:00
Jeff Sharkey
fab0ab3c9c Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script from
detailed ownership information confirmed by team leads.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I9789c97c1de8e5d962b48c29c57d82fe83729eba
Change-Id: I9789c97c1de8e5d962b48c29c57d82fe83729eba
2020-12-08 08:36:27 -07:00