766543 Commits

Author SHA1 Message Date
Lucas Lin
c1165f0b82 Merge "Remove parameter from stopVpnRunnerAndNotifyAppLocked()" 2022-09-13 00:30:10 +00:00
Treehugger Robot
aded52644c Merge "Prevent modifying mAudioPolicies during iteration" 2022-09-12 21:50:52 +00:00
Automerger Merge Worker
e91ea4ebaf Merge "Merge "Activity gain focus failed in InputMethodStressTest" into android13-tests-dev am: 39a6ea0a60" 2022-09-12 18:27:14 +00:00
Treehugger Robot
85343f59b1 Merge "Activity gain focus failed in InputMethodStressTest" into android13-tests-dev am: 39a6ea0a60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2194336

Change-Id: Ibba01429871c8d24790e4ff2dfd094a483b5386b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:27:02 +00:00
Bill Yi
9f510b1618 Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
Atneya Nair
f85e77863e Prevent modifying mAudioPolicies during iteration
Calling release on a policy from mAudioPolicies removes a key from the
map, causing a ConcurrentHashException.
Defer releases till after iteration completes.

Test: Compiles
Bug: 240314224

Change-Id: I83fa969204d8a9c6ac7bae40f5be57a92813f6be
(cherry picked from commit 6f837517a2a9106deac7bb076db1cf78f72e0438)
Merged-In: I83fa969204d8a9c6ac7bae40f5be57a92813f6be
2022-09-12 16:54:29 +00:00
Lais Andrade
db3fb60b2b Merge "Remove VibrationEffect javadocs to methods not available in public APIs." 2022-09-12 14:51:04 +00:00
Lais Andrade
55217bc20b Remove VibrationEffect javadocs to methods not available in public APIs.
Change-Id: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Merged-In: Idf5a339a5fb0ffd510e7fda0e3784916c8505eae
Fix: 245491186
Test: N/A
2022-09-12 12:21:16 +00:00
lucaslin
737d5033cc Remove parameter from stopVpnRunnerAndNotifyAppLocked()
The current design makes the caller can pass any package name,
but in fact, stopVpnRunnerAndNotifyAppLocked() only cares about
the current prepared package. So if the caller pass a package
name which is not the current prepared, the method will not
work. Remove the parameter and use mPackage directly to prevent
the caller misuses this method.

Bug: 236409954
Test: atest FrameworksNetTests:VpnTest
Change-Id: I9297bf97fdcd7cef8ab0dadff3e6c05bf77fc667
2022-09-12 07:55:17 +00:00
Treehugger Robot
f63f20af72 Merge "Fix sticky firstEventAfterDiscontinuity setting" 2022-09-10 00:28:46 +00:00
Brian Duddie
9c7e48eb1e Fix sticky firstEventAfterDiscontinuity setting
This value needs to be explicitly set to false to prevent re-using a
stale "true" value.

Fixes: 245965753
Test: CTS SensorHeadTrackerTest#testDiscontinuity (pending upload)
Change-Id: Icd018e0cab9e30b0677970760a38a390d9dd2a3c
2022-09-09 22:51:38 +00:00
Lucas Dupin
aa33e703e4 Merge "Fix exception caused by system app setting wallpaper" 2022-09-09 21:06:57 +00:00
Andy Hung
eac4885894 Merge "SpatializerHelper: Fix device name translation" 2022-09-09 17:14:08 +00:00
Andy Hung
a9739b791d Merge "AudioSystem: Fix hdmi name typo" 2022-09-09 17:13:12 +00:00
Treehugger Robot
dcef1fb28a Merge "make sure mSurfaceLock.unlock can be executed in unlockCanvasAndPost" 2022-09-09 17:10:06 +00:00
Jack He
0075e9935d Merge "LeAudio: Fix volume control" 2022-09-09 06:03:21 +00:00
Andy Hung
88c2bb83ef SpatializerHelper: Fix device name translation
In the spatializer metrics, bt_a2dp was aliasing to (wired) headphone.

Test: adb shell dumpsys media.metrics
Bug: 233773341
Merged-In: Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34
Change-Id: Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34
(cherry picked from commit 5b3731851fe0005a9bb6e9d6dacf3c82954ef182)
2022-09-08 15:40:09 -07:00
Andy Hung
52a4191ad7 AudioSystem: Fix hdmi name typo
Used for metrics logging.

Test: compiles
Bug: 233773341
Merged-In: I4e2c14f49d96f2bde98b3274233f0dd2083134bb
Change-Id: I4e2c14f49d96f2bde98b3274233f0dd2083134bb
(cherry picked from commit 799bb3e978831068cbba316d6b7be14d85471aae)
2022-09-08 14:39:43 -07:00
Treehugger Robot
cac091cedb Merge "change the format" 2022-09-08 21:31:23 +00:00
Bill Yi
daeec7184f Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Bill Yi
d8fe0f5506 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Bill Yi
6f4e679ba0 Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
Merged-In: I3f9a35cbcb4b5c93c16e9bef04739e5cdbd7ddd4
Merged-In: I496a6f28cc3c48bd595725bce9a24ac4f4e8cc2b
Change-Id: Ic62872d77e7a5a5dfd358777ed22b49d35cb7f8e
2022-09-08 14:23:19 -07:00
Andy Hung
4fca0605bd Merge "AudioService: Fix SpatializerHelper asserts" 2022-09-08 20:56:55 +00:00
Andy Hung
eb72e5eec7 Merge "Spatializer: Fix lost settings after reboot" 2022-09-08 20:56:32 +00:00
Andy Hung
7eba77bbd6 Merge "AudioService: properties for configuring head tracking default" 2022-09-08 20:55:21 +00:00
Andy Hung
68043b022a Merge "Spatializer: Fix usb headset" 2022-09-08 20:52:59 +00:00
Siim Sammul
a12efe5b68 Merge "Also reset the dropbox rate limiter in BootReceiver in addition to ActivityManagerService." 2022-09-08 18:51:41 +00:00
Andy Hung
dddba4569f Merge "SpatializerHelper: fix null routing" 2022-09-08 17:44:41 +00:00
Andy Hung
caf0b4084a Merge "SpatializerHelper: fix sensor reinitialization" 2022-09-08 17:35:05 +00:00
Andy Hung
4dc6c54ddf Merge "AudioService: fix initial spatial audio enable state." 2022-09-08 17:30:38 +00:00
Andy Hung
fe4b37a3ac Merge "SpatializerHelper: Fix device compatibility with spatial audio" 2022-09-08 17:21:09 +00:00
Siim Sammul
5d9430310b Also reset the dropbox rate limiter in BootReceiver in addition to
ActivityManagerService.

Cherry picked from internal master: ag/19867404

Test: atest ErrorsTest
Bug: 242671309
Change-Id: I5ee6d56281d579edf76c73acf81237f42939ead7
Merged-In: I5ee6d56281d579edf76c73acf81237f42939ead7
2022-09-08 10:01:48 +00:00
Ge Tianxiong
00b7871466 Fix exception caused by system app setting wallpaper
It will cause NullPointerException if the system app set the wallpaper
before the third-party app set the wallpaper.

Change-Id: I7e68cf3f89b690c7b114fa087d1fd1203d8eb4d6
2022-09-08 17:26:14 +08:00
Mårten Kongstad
3312d073cb Merge "Update droidstubs to use the SdkExt info file" 2022-09-08 06:08:43 +00:00
Andy Hung
12f9b9fafd Spatializer: Fix usb headset
Fixes the general transaural and
binaural equivalence of different devices.
Prior to this fix only speaker and true 3.5mm wired headphones
could be enabled.

Now all SADevices will have a canonical device type.

Test: Plug in USB headset, verify spatializer works.
Bug: 239081163
Merged-In: I904a299556f1cccb9d8d69a23245e387f7a5d35e
Change-Id: I904a299556f1cccb9d8d69a23245e387f7a5d35e
2022-09-07 19:42:56 -07:00
Andy Hung
9e58b7dede Spatializer: Fix lost settings after reboot
Test: Disable BT/headset spatializer and verify after reboot still
disabled
Bug: 239756754

Merged-In: I68e31377c8cbeab3df5c7924afb7277bf8a30dcd
Change-Id: I68e31377c8cbeab3df5c7924afb7277bf8a30dcd
2022-09-07 19:11:37 -07:00
Lorena Torres-Huerta
29e60dca12 Merge changes from topic "media_common_types_version_bump"
* changes:
  Use explicit aidl versions for audio hal and soundtrigger dependencies.
  Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
2022-09-07 23:30:55 +00:00
Jean-Michel Trivi
4feee6407f AudioService: properties for configuring head tracking default
Define new property to indicate whether head tracking for spatial
audio is enabled by default.
  Read property in AudioService and pass it to SpatializerHeper
which will use the defalut value every time a new device connects.
  Fix unit test to account for recent hardening of device
compatibility management. Add initialiation test method in
SpatializerHelper to ensure we can test settings with devices
for binaural and transaural modes.

Bug: 242620201
Test: pair BT headset, observe head tracking toggle in UI
Test: atest SpatializerHelper
Merged-In: Ie3af7a13537d114cb603d3c83e9ca2ba86cd7f67
Change-Id: Ie3af7a13537d114cb603d3c83e9ca2ba86cd7f67
2022-09-07 16:14:18 -07:00
Jean-Michel Trivi
ed783df9c8 SpatializerHelper: fix null routing
Check for null on current device for media.

Bug: 242213248
Test: check cluster
Merged-In: I263b55565c3c30ee999b7d8513263e0d2e7e76fb
Change-Id: I263b55565c3c30ee999b7d8513263e0d2e7e76fb
2022-09-07 16:02:52 -07:00
Treehugger Robot
1f440e7a62 Merge "Treat R8 warnings as failures for system_server" 2022-09-07 22:53:18 +00:00
Xiaozhen Lin
ce5a2ae1b0 change the format
use "file:" instead of "include"

Test: N/A
Change-Id: I7db7abba49b117f782b557926d06fa858223185b
2022-09-07 22:42:57 +00:00
Eric Laurent
b73e3b550e SpatializerHelper: fix sensor reinitialization
Force reinitializing the sensors if the headtracking is enabled
for a given device and headtracker is not available.

Bug: 244430716
Test: repro steps in bug
Change-Id: Ic16f5be105ae5a95217bf55c2b454fbbbea54893
2022-09-07 14:41:40 -07:00
Eric Laurent
8dcc14f26f SpatializerHelper: Fix device compatibility with spatial audio
Do not consider BT SCO devices as compatible with spatial audio.
This is justified because SCO is mono by nature. It also fixes the
problem of having two devices with the same mac address but conflicting
spatial audio settings.

Bug: 242777739
Test: verify head tracking still works after a phone call
Merged-In: I1918f8ec82e1d79416804a6ec47df7181b0d79eb
Change-Id: I1918f8ec82e1d79416804a6ec47df7181b0d79eb
2022-09-07 14:32:33 -07:00
Eric Laurent
c97c7ce3f2 AudioService: Fix SpatializerHelper asserts
Fix state update in onRoutingUpdated() in case of failure to
communicate to the native spatializer: this can cause an exception later
in setDispatchFeatureEnabledState(). Instead, try to recover by
triggering a reset.

Fix other places where exceptions are thrown instead of just logging an
error or triggering a reset.

Bug: 241018866
Test: make
Merged-In: I2ca01b76d701e7f5db7ba08d159bba843b145e4e
Change-Id: I2ca01b76d701e7f5db7ba08d159bba843b145e4e
2022-09-07 14:21:37 -07:00
Eric Laurent
5b78fb7069 AudioService: fix initial spatial audio enable state.
Fix SpatializerHelper.setSpatializerEnabledInt() to
avoid overriding the enable state computed by onRoutingUpdated()
when spatial audio is enabled.

Bug: 238378679
Test: repro steps in the bug
Merged-In: I2e77945c889c1db093832f780c632a626e979e7c
Change-Id: I2e77945c889c1db093832f780c632a626e979e7c
2022-09-07 14:10:23 -07:00
Xiaozhen Lin
e5d050a64d Merge "Add Bug component ID to the OWNER file" 2022-09-07 21:03:55 +00:00
Felipe Leme
df719daf72 Merge "Update owners for multiuser-related files" 2022-09-07 20:38:37 +00:00
Jared Duke
06689ad1b2 Treat R8 warnings as failures for system_server
Treating warnings as failures avoids unexpected issues at build and
runtime, particularly for missing class references. Unblock this by
adding explicit top-level references to several stub classes, and
suppressing a warning for optional jacococ class references (guarded
by a runtime check in CoverageService).

Test: m services (also w/ EMMA_INSTRUMENT(_FRAMEWORK)=true)
Bug: 242088131
Change-Id: Iee02a30eeccdcf785e90438d1557867ffda659e7
2022-09-07 13:13:01 -07:00
Andy Hung
a36a023dae Merge "SpatializerHelper: fix Settings UI when transaural is not supported" 2022-09-07 19:09:15 +00:00
Julia Reynolds
6ef438e786 Merge "Prevent FGS notification from exceeding allowed" 2022-09-07 18:00:43 +00:00