766543 Commits

Author SHA1 Message Date
William Escande
bb32db2555 [Bluetooth apex] Use new apex name
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: Icd0262c6450c3434f9446eae5b9d4c1edaf05268
2022-08-22 11:27:59 -07:00
Yan Yan
dd4f288e31 Merge "Add three new IKE options in IkeSessionParamsUtils" 2022-08-22 18:04:02 +00:00
Jean-Michel Trivi
ec3e31bc41 Merge "Module API for BluetoothProfileConnectionInfo for BLE with volume" 2022-08-22 16:30:52 +00:00
Prabir Pradhan
b0a2a98f1b Merge "Update OWNERS files for input tests to point to OWNERS of code directory" 2022-08-22 13:35:09 +00:00
Calvin Pan
06734d00dc (ar_AE) Add a locale for Arabic number
ICU changed ar_AE default number system from Arabic to latin. Add a
locale for Arabic so that user can change back to Arabic number system.

en-MV added in CLDR 41.

Bug: 242836935
Test: Check number in system UI.

Change-Id: Ie167cacf8fe99b51a6b1bb39a542bebd76ec2754
Merged-In: Ie167cacf8fe99b51a6b1bb39a542bebd76ec2754
2022-08-22 12:56:45 +00:00
Treehugger Robot
ce2023b664 Merge "View OWNERS: include PendingInsetsController.java in the WindowManager rules" 2022-08-22 11:58:13 +00:00
Donghong Weng
b8ceb69f55 Merge "Fix unqualified-std-cast-call compiler warning" 2022-08-21 07:28:13 +00:00
Treehugger Robot
f986b19767 Merge "BLE audio: support assigning volume at BLE device connection" 2022-08-19 23:57:37 +00:00
Yan Yan
332f738998 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.

This commit can also maintain compatibility with older T IPsec
modules that do not support the two IKE_OPTION_AUTOMATIC_ options

Bug: 242231517
Test: atest IkeSessionParamsUtilsTest
Change-Id: Icadbe98b3df3cf3a80f51dc1467eb99753d82216
2022-08-19 23:52:54 +00:00
Jean-Michel Trivi
4b441c8ef4 Module API for BluetoothProfileConnectionInfo for BLE with volume
Add factory method for BLE output device with volume information

Bug: 233975367
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Change-Id: If9f88e2489f93f05c6c83424fc7b7a12671c1f32
2022-08-19 22:39:24 +00:00
Mikhail Naganov
e9afecbb52 audio: Clarify comments on AudioPortMixExt fields
Specify that '0' means 'unlimited' for
AudioPortMixExt.maxOpenStreamCount, and 'all opened streams'
for maxActiveStreamCount.

Bug: 205884982
Test: N/A
Merged-In: Ia212fef049778a85046e3333faa0ddf8fe167c1f
Change-Id: Ia212fef049778a85046e3333faa0ddf8fe167c1f
(cherry picked from commit 52ca76ed07d48f1d9b884a7082dd7481e35eb5c8)
2022-08-19 22:25:20 +00:00
Yan Yan
c271a2da6a Merge "Revert "Add three new IKE options in IkeSessionParamsUtils"" 2022-08-19 21:28:45 +00:00
Cole Faust
0b33d054b3 Merge "Mark SystemUI-tests as test code for lint" 2022-08-19 20:37:27 +00:00
Yan Yan
006ba183f6 Revert "Add three new IKE options in IkeSessionParamsUtils"
This reverts commit de1dca7c7609a09e83f0c1f58fd9b19024bbbfe1.

Reason for revert: This commit will be cherry picked for QPR
release and is accessing new IPsec API constants
that will not be released until mainline October train. This
commit fails to maintain the compatibility with IPsec
module that is older than the October version.
Bug: 242231517
Test: atest IkeSessionParamsUtilsTest
Change-Id: Iff0dcc32025dad3016257655205beaf2e842f24c
2022-08-19 19:08:49 +00:00
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
Treehugger Robot
166ddba471 Merge "Mark 'session' field in audio HAL AIDL as unused." 2022-08-19 18:45:38 +00:00
Lucas Lin
32b2436597 Merge "Copy isBypassable flag from VpnProfile to VpnConfig" 2022-08-19 09:13:35 +00:00
shaoweishen
93f4aeb2c0 Add OWNER file under SettingsLib/media
Test: N/A
Change-Id: I246f3007f22efa5f35711211e3dd63690e079a03
2022-08-19 08:13:46 +00:00
Adrian Roos
b773c4dade View OWNERS: include PendingInsetsController.java in the WindowManager rules
Change-Id: I8b22a55ccfe3690e9879fcce221c4488f86a9a83
2022-08-19 07:11:47 +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
Nathan Harold
ec65e54a90 Ensure that onCellInfo is always NonNull
During phone creation and phone count changes,
it was possible to get a null value for onCellInfo().

Since the API is documented as NonNull, always return
a non-null value, forcing an empty list in case there
is still a null lurking somewhere else.

Bug: 237964039
Test: atest TelephonyRegistryTest#testCellInfoChanged
Change-Id: I3b46c211f5542a39187b9d3b137f8483c44ccd39
2022-08-18 19:21:18 -07:00
Mikhail Naganov
439df6e295 Mark 'session' field in audio HAL AIDL as unused.
The 'session' field is only used by the framework (if at all),
so it being moved to the HAL AIDL to the system-specific part.

Also update the comment on AudioPort.

Bug: 205884982
Test: m
Merged-In: Ia214c343bbf08c7944ea5ebf6140a92821941b46
Change-Id: Ia214c343bbf08c7944ea5ebf6140a92821941b46
(cherry picked from commit 8abc0314a7e6c6b6569d5e2a21e17c3040101d32)
2022-08-18 22:37:36 +00:00
Prabir Pradhan
7b5ac5cc27 Update OWNERS files for input tests to point to OWNERS of code directory
Bug: None
Test: Upload
Change-Id: I6b7f0e8035ddd1df209b60f125ce68fb2f16fb2c
2022-08-18 18:21:59 +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
Cole Faust
17f1e7268d Mark SystemUI-tests as test code for lint
Lint warns on usages of @VisibleForTesting methods from
non-test code. Since SystemUI-tests is just a regular
android_library instead of an android_test, it was warning
there. Mark it as a test module so lint knows not to warn.

Fixes: 235339747
Test: Presubmits
Change-Id: Ibf8e94c4f9582740e60e285cc918b2976c1fc19a
2022-08-17 19:57:44 +00:00
Colin Cross
0a1823f990 Fix more kotlin 1.7.0 errors
Fix "'when' expression must be exhaustive" and UNEXPECTED_SAFE_CALL
errors.

Bug: 216136346
Test: m checkbuild
Change-Id: I2c1b1f7581426496f31198896c4ff3bd9abf2941
Merged-In: I2c1b1f7581426496f31198896c4ff3bd9abf2941
2022-08-17 19:18:58 +00:00
Lucas Lin
f2d911662e Revert "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CON..."
Revert submission 2141595-GRANT_PLATFORM_VPN

Reason for revert: Refer to the comment in ag/19491935.
Reverted Changes:
I0e0566bb8:Grant the ACTIVATE_PLATFORM_VPN appop if VPN app h...
I0580baca6:Test if VPN app can grant ACTIVATE_PLATFORM_VPN wi...

Change-Id: I6cfdd2b75aa6e7427ffa6024e1c3ff183a3e0379
2022-08-17 06:31:29 +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
donghongweng
1b10e3ff53 Fix unqualified-std-cast-call compiler warning
Test: m
Change-Id: I71ab07cb3edeceb1cf9075680d743fccb9e911c1
2022-08-16 18:16:32 +08: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