Commit Graph

141430 Commits

Author SHA1 Message Date
Xin Li
8e32c5a98b [automerger skipped] Merge 24Q3 to AOSP main am: b3356e7c02 -s ours
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258498

Change-Id: I0fdd6e6217e3e07bfdacd195d71710a15347833c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:27:53 +00:00
Xin Li
3efb972a55 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Cole Faust
9b89e3d643 Fix errorprone issues
IgnoredPureGetter, LenientFormatStringValidation, ProtocolBufferOrdinal, and ReturnValueIgnored.
https://errorprone.info/bugpatterns

Bug: 253827323
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: Ib0a0335aa04b36924adcbfecc830b7392c0e5bec
2024-09-06 13:34:50 -07:00
Xin Li
b3356e7c02 Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
Change-Id: I26d001b3394eca422bbfd66e36f4456d898e7500
2024-09-05 17:02:57 -07:00
Treehugger Robot
96fcc4903b Merge "bluetooth: Refactor BT Audio Codec list" into main am: 7c9f1454da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3241342

Change-Id: I87e97131d3361224aa898838bf6c04308d95bd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 07:23:17 +00:00
Treehugger Robot
7c9f1454da Merge "bluetooth: Refactor BT Audio Codec list" into main 2024-08-28 07:12:30 +00:00
Jakub Rotkiewicz (xWF)
51cac72d94 Merge "bluetooth: Fix Mono/Stereo selection with new codec list" into main am: c640aeeec9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3241341

Change-Id: I08cbe0634d9c4926af2d9ac927e81960d966f5bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 20:42:02 +00:00
Jakub Rotkiewicz (xWF)
ab1a9a73e9 Merge "bluetooth: remove debug logs guard" into main am: 8b780a831e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3241340

Change-Id: Ied02c723be359d7d2873313a05ea9d6c178cd5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-27 20:41:40 +00:00
Jakub Rotkiewicz (xWF)
c640aeeec9 Merge "bluetooth: Fix Mono/Stereo selection with new codec list" into main 2024-08-27 20:25:46 +00:00
Jakub Rotkiewicz (xWF)
8b780a831e Merge "bluetooth: remove debug logs guard" into main 2024-08-27 20:25:31 +00:00
Jakub Rotkiewicz
97b113a660 bluetooth: Refactor BT Audio Codec list
* Show only selectable codecs to the user
* Removed redundant 'abstract' layer
* Disable codec selection when BluetoothA2dp, active device unavailable
  or HD Audio disabled.

Bug: 329809288
Bug: 346490998
Flag: EXEMPT - refactor
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: I56ebfeaf2cfa22ec253db897d7b7e96d1f8eee61
Change-Id: I23714715d9257479f5eac1a172ba1804da7e64e3
2024-08-27 20:15:01 +00:00
Chun-Wei Wang
31ebeb690e Support alternate button
Align the behavior of frp and repair to have them
support the alternate button.

Bug: 339735656
Test: presubmit
Change-Id: Ib785db5ef16a68df4980dee451c6b638692adc5f
2024-08-27 10:16:11 +08:00
Jakub Rotkiewicz
4f441c03a7 bluetooth: Fix Mono/Stereo selection with new codec list
When SBC was selected and user changed Channel mode from Stereo to Mono
the codec type wasn't set properly and the reconfiguration failed.

Bug: 329809288
Flag: EXEMPT - minor refactor
Test: manual - choose SBC and change mode to MONO
Merged-In: If847bab1cc05d8c38a680e87277dd857970b4251
Change-Id: Ie32e3a3aa85f866d504dde7396feacf154a2298b
2024-08-26 11:44:27 +00:00
Jakub Rotkiewicz
1b0d956d08 bluetooth: remove debug logs guard
Bug: 329809288
Flag: EXEMPT - log only
Test: mmm packages/apps/Settings
Merged-In: Ia1626aa6904c90729de518102aedbab226a25692
Change-Id: I1d7c2784d8c81c3c3bfd035c64042553261261f8
2024-08-26 11:43:53 +00:00
SongFerng Wang
f8863ca737 Catch IllegalArgumentException when getting provisioning status am: b781605c1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28930152

Change-Id: Iab377d3822de137bd5ec8ab7f98d85456218a8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 00:31:44 +00:00
SongFerng Wang
b781605c1e Catch IllegalArgumentException when getting provisioning status
getProvisioningStatusForCapability still need the IllegalArgumentException when the subId is -1.

Bug: 346600036
Test: manual test. Disable sim and the settings did not crash.
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37e1d258f88c5129035501d6ced1dab6627da102)
Merged-In: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
Change-Id: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
2024-08-22 00:20:29 +00:00
SongFerng Wang
8761b34cf4 Fix IllegalArgumentException when getProvisioningStatusForCapability am: d67de483b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28900489

Change-Id: I9e701d326af7239f842611cb0574e18f05a5d34e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 08:24:08 +00:00
SongFerng Wang
d67de483b4 Fix IllegalArgumentException when getProvisioningStatusForCapability
The ProvisioningManager.getProvisioningStatusForCapability() throws UnsupportedOperationException when the capability is not supported.

Bug: 346600036
Test: NA
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:370445b773aa7ec69c83904dfdcd2e8f182bb777)
Merged-In: Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1
Change-Id: Ib682b336fdfc4c79a8b3e2fa5ccac8fe9c4e7ba1
2024-08-20 07:51:56 +00:00
Xin Li
fb1de08eff Merge aosp-24Q3-ts-dev
Bug: 358400644
Merged-In: I52b5a62d20ee7df14ecf93c9b0dbbed6f7dc0f0d
Change-Id: If3a7c6d203d73c752c2e354171416e17de747459
2024-08-16 10:15:18 -07:00
Treehugger Robot
05422458fe Merge "Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future" into aosp-main-future 2024-08-15 16:58:27 +00:00
Xin Li
0b886fe303 Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future
Bug: 347831320
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I473577d5983daafb368afa5523bad948499cb9a2
2024-08-14 23:26:30 -07:00
Haijie Hong
61a2efc807 Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259

Change-Id: I4835d1b33e1593892054224dec33ea79e64187dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 10:32:20 +00:00
Haijie Hong
55834fff02 Merge "Add owners for bluetooth settings test folder" into main 2024-08-14 09:56:42 +00:00
Haijie Hong
6f38de4932 Add owners for bluetooth settings test folder
Change-Id: I1503db974eb271890486581d173c1bde8457f7df
2024-08-14 09:42:21 +00:00
Xin Li
20fb15ea4b Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future 2024-08-12 17:14:32 +00:00
Chaohui Wang
fb27c768af Check ims for isVoImsOptInEnabled
If the device does not have PackageManager.FEATURE_TELEPHONY_IMS,
ProvisioningManager.getProvisioningIntValue() could not be called.

Fix: 346708541
Flag: EXEMPT bug fix
Test: manual - SIM settings
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa0d63ce4022fa3ae29b77c299c4dce37d11b338)
Merged-In: I52b5a62d20ee7df14ecf93c9b0dbbed6f7dc0f0d
Change-Id: I52b5a62d20ee7df14ecf93c9b0dbbed6f7dc0f0d
2024-08-12 05:12:10 +00:00
Treehugger Robot
d005b3250b Merge "Fix DoubleBraceInitialization errorprone issues" into main am: 05c4027843
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3214820

Change-Id: I5b364535808594161ae0aa7fe6d2eb75149fdd77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 23:31:01 +00:00
Treehugger Robot
05c4027843 Merge "Fix DoubleBraceInitialization errorprone issues" into main 2024-08-09 23:12:10 +00:00
Cole Faust
2483b32069 Fix DoubleBraceInitialization errorprone issues
https://errorprone.info/bugpattern/DoubleBraceInitialization

Flag: EXEMPT refactor
Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Idf52035a720f051a43553b53a89a37131d4e208b
2024-08-09 15:05:14 -07:00
Chaohui Wang
6d09b136d5 Merge "Reduce flaky of AppNotificationPreferenceTest" into main am: 422770ed1e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3212002

Change-Id: If04a3e903a7fd151dd07004eba283f41df044ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 06:55:52 +00:00
Chaohui Wang
422770ed1e Merge "Reduce flaky of AppNotificationPreferenceTest" into main 2024-08-09 06:43:05 +00:00
Chaohui Wang
7380359520 Reduce flaky of AppNotificationPreferenceTest
Bug: 355413226
Flag: EXEMPT test only
Test: atest AppNotificationPreferenceTest
Change-Id: I1dfe4c5ae764941acb78e8fad52518963d1dad74
2024-08-09 05:33:27 +00:00
Xin Li
e2d326beeb Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320
Merged-In: I2489a64804f068a957f9be3f87847d6911b24447
Change-Id: I1885ef34f69ac4eb6e76ac903fcacdebe4139ae1
2024-08-08 11:41:20 -07:00
Treehugger Robot
12c60990a6 [automerger skipped] Merge "Add missing required permissions for Settings" into main am: eb79f88253 -s ours
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3141176

Change-Id: I2467eef95775cda018558a951233431e45487f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 08:45:34 +00:00
yomna
12eb946b55 [automerger skipped] Add missing required permissions for Settings am: a23b057db2 -s ours
am skip reason: Merged-In I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8 with SHA-1 3fe5e5f843 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3141176

Change-Id: Ie56ecc6d5230876d92913b648540d52d0167e4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 08:45:29 +00:00
Treehugger Robot
eb79f88253 Merge "Add missing required permissions for Settings" into main 2024-08-07 08:25:55 +00:00
yomna
a23b057db2 Add missing required permissions for Settings
SettingsSpaUnitTests BackgroundInstalledAppsPageProviderTest#title_displayed is failing due to
missing permissions GET_BACKGROUND_INSTALLED_PACKAGES, which is required for the test.

Fix: 357970545
Test: m & atest SubscriptionInfoListViewModelTest SettingsSpaUnitTests
Change-Id: I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8
Merged-In: I88038a5858e9a969ca8e3df6bc4e4e33d753f1e8
2024-08-07 07:53:01 +00:00
Treehugger Robot
550a4253ed Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-08-07 06:31:13 +00:00
Treehugger Robot
e5d3e4b6f1 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2024-08-07 06:31:13 +00:00
Bill Yi
734f9c13ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iadb5679a0adf0967e9bca8bb205376f06fc46d3b
2024-08-06 17:11:21 -07:00
Bill Yi
97b9986d5c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie79f4a00fd2faa6f1f8131691c10e3d46456424b
2024-08-06 17:09:33 -07:00
Bill Yi
6c0c6b61c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieaf59078e8adaae4d3a03fe0ae3f47ec4e2e913a
2024-08-06 17:08:00 -07:00
Android Build Coastguard Worker
94ea022aa1 Merge cherrypicks of ['googleplex-android-review.googlesource.com/28600455', 'googleplex-android-review.googlesource.com/28600456', 'googleplex-android-review.googlesource.com/28600458'] into 24Q3-release.
Change-Id: I24e42a4830ce637feed658ee4114eb70adc6e0d2
2024-08-06 09:33:38 +00:00
Bill Yi
ca9227cb22 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bfc1bba0a2205b19121ccfa38b5e848908b4705)
Merged-In: If3d00eec44ea2235c842a0069d7a9c1bf826494e
Change-Id: If3d00eec44ea2235c842a0069d7a9c1bf826494e
2024-08-06 09:22:08 +00:00
Bill Yi
360b4f5d93 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e7dff9e44ae851aa389fc3d6264f42ddbba47eb9)
Merged-In: I3e7d733c95f32a4896d5148e8be58973ae1ad61a
Change-Id: I3e7d733c95f32a4896d5148e8be58973ae1ad61a
2024-08-06 09:21:48 +00:00
Bill Yi
c9125eb9ec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 347053373
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b86bdbab43b4725c1df08dd3e0243743d9399e30)
Merged-In: I2ffb0010fb53dd8cc60496bfec0c5644a5388200
Change-Id: I2ffb0010fb53dd8cc60496bfec0c5644a5388200
2024-08-06 09:21:34 +00:00
Android Build Coastguard Worker
c0f0bbfe24 Merge cherrypicks of ['googleplex-android-review.googlesource.com/28486054'] into 24Q3-release.
Change-Id: Iaae305d40fbf8e5b7095e79d3ade135dc0626ac0
2024-07-30 00:02:58 +00:00
Les Lee
ae2195c549 wifi: fix ADB URI doesn't work
Using old WifiQrCode parsing for ADB Uri.

Flag: EXEMPT bugfix
Bug: 355088188
Test: Manual test & TH
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:da21128568e29a6c2992b1b38cbb2db9ec36892f)
Merged-In: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
Change-Id: I54a12b03ed9be6dc49fb957df0f1f7b31647810d
2024-07-29 23:56:20 +00:00
Treehugger Robot
5079417396 Merge "Remove unecessary logs" into main am: 5e487ed591
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191355

Change-Id: Ifa53f9c0acf7e57ee6a2c1e2fad9e094612aea0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-29 02:16:39 +00:00
Treehugger Robot
5e487ed591 Merge "Remove unecessary logs" into main 2024-07-29 01:43:55 +00:00