Commit Graph

10528 Commits

Author SHA1 Message Date
Hongguang
afe481fcd1 Rename setNumOfSegment and getNumOfSegment
Bug: 205738761
Test: atest android.media.tv.tuner.cts
Change-Id: Ibaa1fcc8df6b13d60ea7d7bb5ea0d0d20e0dd653
2021-11-16 16:55:15 +00:00
Eric Laurent
c234ea55e9 Merge "audio: add call redirection audio modes" 2021-11-16 16:17:57 +00:00
Yixiao Luo
6f6e653467 Merge "add function setTvView to link the input Session and IApp Session" 2021-11-16 03:01:40 +00:00
Antonio Kantek
abb67140e4 Merge "TouchMode (6.1/n) Fully detaching touch mode from focus event" 2021-11-16 01:32:17 +00:00
Yixiao Luo
104149e906 add function setTvView to link the input Session and IApp Session
Bug: 204926703
Change-Id: I235e9817ce47dd8d5bed1fbc322a7cb68d4bcdf5
2021-11-15 23:48:31 +00:00
Eric Laurent
1c3408fc6d audio: add call redirection audio modes
Add two audio modes corresponding to a call redirection
scenario:
- AudioManager.MODE_CALL_REDIRECT: PSTN call redirection
- AudioManager.MODE_COMMUNICATION_REDIRECT: VoIP call redirection

When in call redirect mode, call audio uplink and downlink are not
routed to regular audio sinks (e.g. earpiece) or sources (e.g. built in
mic) but disconnected. A privileged app can use system APIs to inject
and extract call audio and redirect the call to another device.

All other media use cases operate as if no call was active.

Bug: 189472651
Test: make
Change-Id: I3b1a616a72b1f7c97e0e5bf7c9f76c40a28876f1
2021-11-15 14:02:28 +01:00
TreeHugger Robot
ee888a9b76 Merge "Remove RingtoneManager.*SyncFromParent APIs" 2021-11-14 18:13:16 +00:00
Antonio Kantek
d30cab4e6d TouchMode (6.1/n) Fully detaching touch mode from focus event
Note: ScreenshotTests properly exercises both IWindow#onFocusEvent and
JNI InputEventReceiver.

Bug: 193718270
Test: atest FrameworksCoreTests:ViewRootImplTest
Test: atest com.android.server.wm.ScreenshotTests
Test: atest FrameworksCoreTests
Test: atest CtsInputMethodTestCases
Test: atest CtsInputTestCases
Test: atest CtsSecurityTestCases
Test: atest CtsWindowManagerDeviceTestCases
Change-Id: I63d973978a048498e59c8df34f624b623e8e9289
2021-11-12 02:25:58 +00:00
wescande
7c17ba0c0d A2DP switch device refactor
Bluetooth mainline effort to reduce AudioManager API

Test: Manual
Tag: #refactor
Bug: 190422401
Fix: 197715842
Fix: 197932292
Change-Id: I65c6561969d443e80f0a49256770279cd0959352
2021-11-10 18:51:27 +01:00
Treehugger Robot
e6148092c3 Merge "Replace object tag with img tag in javadoc" am: db5da1ce28 am: f6bb2b1c0c am: 345dbdd018 am: df3d79cfde am: 2fab5c8f49
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733752

Change-Id: I6a6210691952f5574518442e1dc2b822c5b3310b
2021-11-09 12:22:05 +00:00
Treehugger Robot
2fab5c8f49 Merge "Replace object tag with img tag in javadoc" am: db5da1ce28 am: f6bb2b1c0c am: 345dbdd018 am: df3d79cfde
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733752

Change-Id: I414aad5225cb7d577109eab4bda9aebd78ec1acd
2021-11-09 11:53:59 +00:00
Treehugger Robot
df3d79cfde Merge "Replace object tag with img tag in javadoc" am: db5da1ce28 am: f6bb2b1c0c am: 345dbdd018
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733752

Change-Id: Iafa45e2667543f97d1d880b27a7c41177feb1eb1
2021-11-09 11:35:11 +00:00
Treehugger Robot
db5da1ce28 Merge "Replace object tag with img tag in javadoc" 2021-11-09 09:55:36 +00:00
Kensuke Miyagi
6309f5ae9f Merge "Do not call TunerResourceManager#releaseFrontend for sharees" 2021-11-08 17:50:04 +00:00
TreeHugger Robot
0a476abcbf Merge "Changed user check for play sound effect API" 2021-11-06 05:38:09 +00:00
Kensuke Miyagi
11c15fa951 Do not call TunerResourceManager#releaseFrontend for sharees
Bug: 205360717
Test: android.media.tv.tuner.cts.TunerTest
Change-Id: I514d54de38bc03defe724d72db8af7fb2f1c651f
2021-11-05 20:42:24 -07:00
Oscar Azucena
21f2c4d59a Changed user check for play sound effect API
Changed the way the user is checked for audio manager play sound effect
API. Instead of capturing the process user, the current user is used
to determined if the audio should be played. Also moved the should
sound play check to audio service, as the check requires interact
across users permission, instead of adding permission to the API
this can be faciliated in the audio service.

Bug: 165038414
Test: atest AudioManagerTest#testSoundEffects
Test: atest AudioManagerTest#
	testCheckingZenModeBlockDoesNotRequireNotificationPolicyAccess
Test: atest VolumeDialogControllerImplTest
Test: manually disable audio effect sounds settings and play audio
NoNonSdkCheck: IAudioService#playSoundEffect is internal API
Change-Id: Ib0e3001fd76e3a5fdd831551d16f091029d03422
2021-11-06 02:27:41 +00:00
Shubang Lu
e69a650f4b Merge "TIAF: handle surface and surface view" 2021-11-05 07:36:28 +00:00
shubang
dc1039ac0f TIAF: handle surface and surface view
Bug: 204278304
Test: mmm
Change-Id: I9e040d1a6f86f03b40e2db9660bae18cfc058f73
2021-11-04 16:01:43 -07:00
Hongguang Chen
8d1a673ee1 Merge "Add ISDB-T Multi-Layer Support." 2021-11-04 21:29:24 +00:00
Hongguang
b8b1e1da73 Add ISDB-T Multi-Layer Support.
Because ISDB-T has up to three layers
(1) It is necessary to be able to obtain the hierarchical structure and
information of each hierarchy by getFrontendStatus. Various transmission
parameters, partial reception flags, error states at each level, etc.
(2) It is necessary to be able to set the transmission parameters of
each layer at the time of request. Various transmission parameters and
partial reception flags.

android.Manifest.permission.ACCESS_TV_TUNER is the overall control to
the tuner resources, it's already checked before querying frontend
status.

Bug: 171537116
Test: atest android.media.tv.tuner.cts on AIDL and HAL HALs.
Change-Id: I0d5a6056a09de5509be0a45cac435da4a43ab55f
2021-11-04 15:29:28 +00:00
Treehugger Robot
616107cc70 Merge "remove AudioManager.setParameters from bluetooth" am: ec9a8515d7 am: c3be61fbd6 am: 0cc39d8e29 am: f6d9afa480 am: 1dc504cb94
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859354

Change-Id: I0415e76479ea33e158577bd1352881cae7e48518
2021-11-03 18:07:45 +00:00
Treehugger Robot
1dc504cb94 Merge "remove AudioManager.setParameters from bluetooth" am: ec9a8515d7 am: c3be61fbd6 am: 0cc39d8e29 am: f6d9afa480
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859354

Change-Id: I324bc046d7bbe02fcf6917881546ba0cd8ef6147
2021-11-03 18:06:19 +00:00
Bill Yi
982bb0f145 Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Treehugger Robot
f6d9afa480 Merge "remove AudioManager.setParameters from bluetooth" am: ec9a8515d7 am: c3be61fbd6 am: 0cc39d8e29
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859354

Change-Id: I2a8f73452b45554f7cdaffc9846418664049eee7
2021-11-03 17:50:20 +00:00
Treehugger Robot
c3be61fbd6 Merge "remove AudioManager.setParameters from bluetooth" am: ec9a8515d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1859354

Change-Id: I7702c011f0255803978f028bb36a7f8996f260d6
2021-11-03 17:13:51 +00:00
Treehugger Robot
ec9a8515d7 Merge "remove AudioManager.setParameters from bluetooth" 2021-11-03 17:00:22 +00:00
Robin Lee
9959d337c1 Remove RingtoneManager.*SyncFromParent APIs
These operations can be done already if the caller has
WRITE_SECURE_SETTINGS_PERMISSION, and the only approved callers are
settings apps which have that permission. We don't want anyone else
to bypass the permission check and turn off parent sounds sync.

Test: atest SettingsRoboTests
Bug: 204555055
Change-Id: I47956428f5363affef29af9dbe3d3dde21c5a392
2021-11-03 11:05:20 +01:00
Bill Yi
ba584f1fa1 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516
2021-11-02 21:07:53 -07:00
TreeHugger Robot
fd747ca630 Merge "Enhance channel masks conversion between AIDL and SDK" 2021-11-02 22:24:37 +00:00
The Android Open Source Project
a2d1cd7262 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: I4826d32c3aae06b61a992985d127320efbe96289
2021-11-02 14:11:55 -07:00
Mikhail Naganov
e1f9659e5d Enhance channel masks conversion between AIDL and SDK
Provide conversion for layouts not listed in
AudioChannelLayout::LAYOUT_* constants. In this case
the conversion is performed on bit-by-bit correspondence
between AudioChannelLayout::CHANNEL_* constants and
SDK channel bits from AudioFormat.

Added missing input channel bits to AudioFormat to match
native. Currently hidden, since we would need to update
docs if we reveal these bits and masks to apps.

Bug: 198812639
Bug: 204362366
Test: atest AidlConversionUnitTests
Change-Id: I7cb80fef2bfe9513f16dc632b22ef81b1e0f0526
2021-11-02 20:48:33 +00:00
William Escande
ef429b62b1 remove AudioManager.setParameters from bluetooth
All uses of AudioManager.setParameters are a hack that we have to remove.

Bug: 196440888
Tag: #refactor
Test: Build
Change-Id: I6deeffef8fbd8ba1c501f41c74b4763503106cc0
2021-11-02 16:38:15 +01:00
TreeHugger Robot
1852027812 Merge "Fix DtmbFrontendSettings annotations." 2021-11-01 17:14:14 +00:00
Hongguang Chen
bf1e3768ce Merge "Add SharedFilter to tuner frameworks." 2021-11-01 16:26:10 +00:00
Hongguang
0dbd778319 Fix DtmbFrontendSettings annotations.
Bug: 204494028
Fix: 204494028
Test: atest android.media.tv.tuner.cts
Change-Id: Ic69402a31c34aee80f0ae65b8b71594694d2e9b4
2021-10-29 21:02:55 -07:00
TreeHugger Robot
9a23c4f0a8 Merge "Add Context constant for TV IApp Service" 2021-10-29 19:40:39 +00:00
Hongguang
bcca4dc8b9 Add SharedFilter to tuner frameworks.
The SharedFilter is used to share the Filter created by TIS to another
process. The TIS uses Filter.createSharedFilter() to create a token and
share it to another process. The new process will use
Tuner.openSharedFilter() to open that new token and create a
SharedFilter. The new process will be able to read the TIS owned
Filter's data with this new SharedFilter.

Bug: 196124225
Test: atest android.media.tv.tuner.cts on both AIDL and HIDL HAL.
Change-Id: Id93b30e4db242d35a3d1ae6023b967a90a78c448
2021-10-29 12:05:29 -07:00
Kensuke Miyagi
9d04cb7db1 Merge "Add @RequiresPermission to tuner resource inquery APIs" 2021-10-29 18:12:28 +00:00
shubang
4500e391b9 Add Context constant for TV IApp Service
Bug: 203730671
Test: mmm
Change-Id: I5785312a18de3110800e39158d31bcc5f06803ea
2021-10-29 17:33:22 +00:00
Kensuke Miyagi
f2b43bc5cd Add @RequiresPermission to tuner resource inquery APIs
Bug: 203535048
Test: android.media.tv.tuner.cts.TunerTest
Change-Id: I56ca4e7c0986d968ab7bfa1a5ce7fd50f84b9487
2021-10-29 09:30:52 -07:00
TreeHugger Robot
8c6c622282 Merge "AudioManager: isFixedVolume() fix for dynamic volume behavior" 2021-10-28 19:23:55 +00:00
Jean-Michel Trivi
547d2636ae AudioManager: isFixedVolume() fix for dynamic volume behavior
AudioManager.isFixedVolume() was only considering the fixed volume
global property, but was not checking the current volume behavior.

Bug: 203034282
Test: atest MediaActivityTest ; atest MediaRouter2Test#testCallbacksAreCalledWhenVolumeChanged
Change-Id: I1e22e5bcd75c41c1ab6a47dc1e0d7619df989970
2021-10-27 19:45:42 -07:00
TreeHugger Robot
8d2d9ded31 Merge "Return error if the a new tune() is called with different frontend type." 2021-10-27 02:22:47 +00:00
Hongguang
e47c7237fb Return error if the a new tune() is called with different frontend type.
Bug: 204235120
Test: atest android.media.tv.tuner.cts
Change-Id: I914df11fc223d2902ecbdb20a9cecbbe726c904f
2021-10-27 00:01:32 +00:00
Lajos Molnar
3dce63e6b4 Merge "media: allow excluding arbitrary codecs from REGULAR_CODECS list." am: 36fb4b48b4 am: 4209666577 am: 7aa8c12dcf am: 04ab4930c0 am: edfd748dbc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1867088

Change-Id: I575abb4c3f2e1df62fb88a548168ee54a0a6e9c5
2021-10-26 23:58:59 +00:00
Lajos Molnar
edfd748dbc Merge "media: allow excluding arbitrary codecs from REGULAR_CODECS list." am: 36fb4b48b4 am: 4209666577 am: 7aa8c12dcf am: 04ab4930c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1867088

Change-Id: I8bb700a6e65cb983413f86e1458d44e947c01c7f
2021-10-26 23:37:04 +00:00
Lajos Molnar
04ab4930c0 Merge "media: allow excluding arbitrary codecs from REGULAR_CODECS list." am: 36fb4b48b4 am: 4209666577 am: 7aa8c12dcf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1867088

Change-Id: Iee745f46101cac07d3d03aeca72b28b34e015bce
2021-10-26 23:16:19 +00:00
Lajos Molnar
7aa8c12dcf Merge "media: allow excluding arbitrary codecs from REGULAR_CODECS list." am: 36fb4b48b4 am: 4209666577
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1867088

Change-Id: I10c197f82ff6651a0c51461852e6c9c312cf931d
2021-10-26 22:46:50 +00:00
Jean-Michel Trivi
15b00ade2c MediaFormat: fix key value for KEY_MAX_OUTPUT_CHANNEL_COUNT am: a991d6bdc2 am: 42bf4dc517
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16118478

Change-Id: I3ae18c87b8db42e5cd8442d17eef7c5baff874d8
2021-10-26 18:54:52 +00:00