Commit Graph

766308 Commits

Author SHA1 Message Date
Jean-Michel Trivi
c408b9825f BLE audio: support assigning volume at BLE device connection
Add support for associating an initial volume with a BLE
connection:
- add volume info to BluetoothProfileConnectionInfo in a new
BLE output factory method
- when handling device connection for BLE, also check if
volume information from the connection information is available.

Bug: 233975367
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Change-Id: Ib54267727bc4d47e6999f2b84eab805f23c4955a
Merged-In: Ib54267727bc4d47e6999f2b84eab805f23c4955a
2022-08-19 18:50:50 +00:00
Lucas Lin
32b2436597 Merge "Copy isBypassable flag from VpnProfile to VpnConfig" 2022-08-19 09:13:35 +00:00
Chiachang Wang
047585ed00 Merge changes I9eed58b2,Ie83c5ee3
* changes:
  Skip events on stale Ikev2VpnRunner
  Invert the order of event sending and VpnRunner.exit()
2022-08-19 03:09:34 +00:00
Treehugger Robot
15f9600eb6 Merge "Add three new IKE options in IkeSessionParamsUtils" 2022-08-19 02:49:04 +00:00
lucaslin
c43db8b4e6 Copy isBypassable flag from VpnProfile to VpnConfig
Copy isBypassable flag from VpnProfile to VpnConfig so that
ConnectivityService can set the correct config to netd when
network is created.

VpnConfig#allowBypass isn't set for platform VPN when
startVpnProfilePrivileged tries to convert the VpnProfile
to VpnConfig.

Bug: 242931436
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2
2022-08-18 11:18:43 +08:00
chiachangwang
5a0ea79c41 Skip events on stale Ikev2VpnRunner
The exit() of of VpnRunner will do exitVpnRunner() and
cleanupVpnStateLocked(). But the exitVpnRunner() posts a runnable
to the executor. This means that disconnectVpnRunner() might run
concurrently with cleanupVpnStateLocked(), and it might even
complete after cleanupVpnStateLocked() finishes. After exiting
the runner, the states are reset. The remaining events in the
executor are irrelavent and should be skipped to prevent
accessing any of the outer class's members.

Also add missing synchronized block by verify that there is no
other field of the outer Vpn class that is used inside
Ikev2VpnRunner implicitly.

Bug: 235322391
Test: atest FrameworksNetTests
Change-Id: I9eed58b2e96ebaf33e557a42e83525a74a4697d8
2022-08-18 03:14:22 +00:00
chiachangwang
1cf151d917 Invert the order of event sending and VpnRunner.exit()
Invert the order to prevent confusing VPN disconnected
notification being sent before the runner actually exits.

Bug: 235322391
Test: atest FrameworksNetTests
Change-Id: Ie83c5ee35509f6ba10465fd9867c596a956e189a
2022-08-18 02:18:50 +00:00
Yan Yan
de1dca7c76 Add three new IKE options in IkeSessionParamsUtils
This commit updates IkeSessionParamsUtils to be able
to encode/decode IkeSessionParams with IKE_OPTION_REKEY_MOBILITY,
IKE_OPTION_AUTOMATIC_ADDRESS_FAMILY_SELECTION and
IKE_OPTION_AUTOMATIC_NATT_KEEPALIVES

Bug: 242231517
Test: atest IkeSessionParamsUtilsTest
Change-Id: I0ea9fbf1e0c304a5afb563f912d2a8a49b4faad0
2022-08-17 20:37:16 +00:00
Treehugger Robot
e648d3cb91 Merge "usb: Don't show the notification when no USB device is connected" 2022-08-17 05:58:32 +00:00
Tyler Gunn
c4cfeaf45f Merge "Update API docs for TelephonyManager#registerTelephonyCallback." 2022-08-16 21:45:45 +00:00
Xin Li
258ded61cd Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:18 +00:00
Treehugger Robot
3d98002eab Merge "Expand HardwareBuffer owners to include header" 2022-08-16 13:45:10 +00:00
Xin Li
98bb5a14bb DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I2d525d59c24df63429ef090e41e45952506c1c59
Change-Id: I2a6d4e66fb340c995bf4a004f22bd44ddeae6267
2022-08-15 22:03:21 -07:00
John Reck
8787a00ee2 Expand HardwareBuffer owners to include header
Test: n/a
Change-Id: I033ce05aa32d93ad03e275654f2b62e8200c7794
2022-08-15 15:49:55 -04:00
Jack Yu
ca9ea94b2d Merge "Temporarily reduced owners during refactoring" am: f6e4707393
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2184606

Change-Id: I5ad87189f9087cce52e579cace2d516147265553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 17:50:03 +00:00
Jack Yu
f6e4707393 Merge "Temporarily reduced owners during refactoring" 2022-08-15 17:31:01 +00:00
Treehugger Robot
82c1a3d0bf Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" am: 863a88ef07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185016

Change-Id: Ic35c9c2bff296f0f8419354e9a79ebcbb3fad57b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 15:46:41 +00:00
Treehugger Robot
863a88ef07 Merge "Remove the suggestion to AsyncTask.SERIAL_EXECUTOR" 2022-08-15 15:26:56 +00:00
Summers Pittman
660b6eeb96 Merge "Remove extraneous help text for pm set-app-links-allowed command" am: a28a44c82e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2179915

Change-Id: Ica0a59faf463523e91bcdbda28636cc6f381bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 15:04:57 +00:00
Summers Pittman
a28a44c82e Merge "Remove extraneous help text for pm set-app-links-allowed command" 2022-08-15 14:35:13 +00:00
Adrian Roos
d283ac489f Merge "Better OWNERS for system_messages.proto" am: 74a44839b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2186207

Change-Id: I12dcc6ee79a83b06a79e820da82ab99ff8aeef4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 13:38:07 +00:00
Adrian Roos
74a44839b9 Merge "Better OWNERS for system_messages.proto" 2022-08-15 13:15:44 +00:00
Adrian Roos
718fd088eb Better OWNERS for system_messages.proto
This file notification ids to be used anywhere in the android package (e.g. system_server). Match platform resource OWNERS that has similar scope.

Change-Id: I2d525d59c24df63429ef090e41e45952506c1c59
2022-08-15 13:06:18 +00:00
Jack Yu
e76f42d8e7 Temporarily reduced owners during refactoring
Temporarily reduced owners during refactoring. This
is to make sure the new changes added by other developers
will be properly reviewed and picked up by the new code.

Bug: 239607619
Test: None
Change-Id: I57dfe67a4ade5acc7f5ad8b8b55faecc9ea00f03
2022-08-13 17:22:03 -07:00
TreeHugger Robot
d0a33a5a66 Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into stage-aosp-master 2022-08-13 13:38:34 +00:00
TreeHugger Robot
c735b93e37 Merge "Fix SystemUI build for kotlin 1.7.0" into stage-aosp-master 2022-08-12 21:56:44 +00:00
Xin Li
a3d2509794 DO NOT MERGE - Merge TP1A.220624.021.A1
Merged-In: Ice6de1149b05564294e5c51308e962112cf4eda7
Change-Id: Ibe4efa97b786828db4ddce40f0cfcd45c6188682
2022-08-12 14:10:50 -07:00
Jack Yu
6a75bf4c4f [automerger skipped] Merge "APIs for SIM call manager voice status" am: 02772f2e7a -s ours
am skip reason: Merged-In If7a5b03a7aa630823ac238ef27721e5e6cc596e6 with SHA-1 2526568630 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954098

Change-Id: Ide4b72747f3378705682a3a3e76bd861be162723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 21:05:01 +00:00
Hunter Knepshield
028d9da9cb [automerger skipped] APIs for SIM call manager voice status am: d98616989e -s ours
am skip reason: Merged-In If7a5b03a7aa630823ac238ef27721e5e6cc596e6 with SHA-1 2526568630 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954098

Change-Id: I89931ca390eccbb16c3405dd2d18d7dd82cf76ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 21:04:36 +00:00
Colin Cross
004f092eda Fix SystemUI build for kotlin 1.7.0
Kotlin 1.7.0 converts the UNEXPECTED_SAFE_CALL warning into an error:

frameworks/base/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt:780:68: error:
type mismatch: inferred type is Boolean? but Boolean was expected
        if (useMediaResumption && removed?.resumeAction != null && removed?.isLocalSession()) {
                                                                   ^

Replace the unnecessary ?. operator.

Bug: 216136346
Test: builds
Change-Id: Ib1605aaff28492b557deac4156f3cc2f4cf8b329
(cherry picked from commit 6e3d0a66d2)
Merged-In: Ib1605aaff28492b557deac4156f3cc2f4cf8b329
2022-08-12 20:45:59 +00:00
Jack Yu
02772f2e7a Merge "APIs for SIM call manager voice status" 2022-08-12 20:40:03 +00:00
Treehugger Robot
0699d0238b Merge "Fix unused-but-set-variable warnings" am: eab658e213
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2160458

Change-Id: Iaf85e75223310d32ea972c779d5146748f2d9653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 20:26:55 +00:00
Treehugger Robot
eab658e213 Merge "Fix unused-but-set-variable warnings" 2022-08-12 20:00:13 +00:00
Hunter Knepshield
d98616989e APIs for SIM call manager voice status
This CL creates two new PhoneAccount capabilities for the SIM call
manager (and potentially telephony itself for PSTN PhoneAccounts) to
advertise that they support voice calling, potentially independent of
voice service state. With this information, telecom will feed updated
back into telephony for plumbing through the standard ServiceState-based
APIs.

Bug: 205737545
Test: atest android.telecom.cts.PhoneAccountOperationsTest
  (an additional CTS test for the TelephonyManager API will be added as
  a follow-up)
Change-Id: If7a5b03a7aa630823ac238ef27721e5e6cc596e6
Merged-In: If7a5b03a7aa630823ac238ef27721e5e6cc596e6
2022-08-12 18:22:29 +00:00
Bob Badour
e8764668de Merge "Add stats to notice UI." am: 1db210c09c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2180037

Change-Id: I9e740ea835c74d0f0d57369384ae540cf83a2f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 14:29:39 +00:00
Bob Badour
df27d18f17 Merge "Fix broken anchor tags." am: 008ca223c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2181757

Change-Id: Ifb362dfa1c14dec56b929946229843cb3c6d1244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 14:28:51 +00:00
Bob Badour
1db210c09c Merge "Add stats to notice UI." 2022-08-12 14:09:19 +00:00
Bob Badour
008ca223c7 Merge "Fix broken anchor tags." 2022-08-12 14:07:53 +00:00
Kyunglyul Hyun
26943c4c90 [automerger skipped] Merge "Fix AudioDeviceInventory#disconnectLeAudio" am: cfe3dc567f -s ours
am skip reason: Merged-In Ifd74c244e19f5e7f92fdbd8f7d20cd99a054425a with SHA-1 695a264811 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185396

Change-Id: Iaeefcd48f7d59c114540766715b7aa73a054d102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 10:55:36 +00:00
Kyunglyul Hyun
48107259c4 [automerger skipped] Fix AudioDeviceInventory#disconnectLeAudio am: 80786db7b4 -s ours
am skip reason: Merged-In Ifd74c244e19f5e7f92fdbd8f7d20cd99a054425a with SHA-1 695a264811 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2185396

Change-Id: Idc8c8527d54f316e6dd1d7c1864650ddca75f3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 10:55:14 +00:00
Kyunglyul Hyun
cfe3dc567f Merge "Fix AudioDeviceInventory#disconnectLeAudio" 2022-08-12 10:06:35 +00:00
Kyunglyul Hyun
80786db7b4 Fix AudioDeviceInventory#disconnectLeAudio
This CL fixes disconnectLeAudio to disconnect devices properly
and make it send becoming noisy intent when
an LE audio device is disconnected.

It also calls disconnectLeAudio for broadcast profiles.

Bug: 230298077
Test: manually turning off BT to check if
media is paused.

Merged-In: Ifd74c244e19f5e7f92fdbd8f7d20cd99a054425a
Change-Id: Ifd74c244e19f5e7f92fdbd8f7d20cd99a054425a
(cherry picked from commit 695a264811)
2022-08-12 08:08:37 +00:00
Bob Badour
a52ed87bb0 Add stats to notice UI.
https://screenshot.googleplex.com/3WFzphfDAifZZvF

Bug: 241421504

Test: m droid dist

Change-Id: I1b85a60345bedb108ba5186bdc4a4667890ba4e5
2022-08-12 05:39:57 +00:00
Bob Badour
b59def48c9 Fix broken anchor tags.
Test: m droid dist

Change-Id: Ie27ab42f10a00d1c982f4d3ef928cca58019dc1f
2022-08-11 20:51:39 -07:00
Jimmy Hu
7b9a26138f usb: Don't show the notification when no USB device is connected
Currently, the "Charging connected device via USB" notification appears
and then disappears when a USB device is disconnected. The notification
should not appear when no USB device is connected. This CL prevents
this.

Also prevents the notification from showing up when a mouse is
connected.

Bug: 234548453
Test: Peripheral mode, host mode, and Power/Data role swap
Signed-off-by: Jimmy Hu <hhhuuu@google.com>
Merged-In: Ie4c67c639d8633361e5a3675502283cae4e35bd9
Change-Id: Ie4c67c639d8633361e5a3675502283cae4e35bd9
2022-08-12 02:31:25 +00:00
Sooraj Sasindran
f2812a91e0 Remove the suggestion to AsyncTask.SERIAL_EXECUTOR
Bug: 242220307

Change-Id: I7a7614e9764b26a34b9bcad16b05b521f7f9ff63
2022-08-12 00:42:17 +00:00
Treehugger Robot
ea4b4e5a83 Merge "Update OWNERS for RemoteViews related files." am: 00545d0fd6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2180621

Change-Id: I4beccbf68d0b3b841b2e629be2a5f2662fe90f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 17:07:04 +00:00
Treehugger Robot
00545d0fd6 Merge "Update OWNERS for RemoteViews related files." 2022-08-11 16:49:52 +00:00
Chiachang Wang
880e944b9c Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" am: 1660147b84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2183496

Change-Id: Iabdd1bc7277878efe22bb808394f9239acb96a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 12:09:12 +00:00
Chiachang Wang
1660147b84 Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" 2022-08-11 11:44:07 +00:00