Treehugger Robot
d387132098
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-09-11 23:07:15 +00:00
Treehugger Robot
0e72c6c9eb
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-09-11 23:07:15 +00:00
Treehugger Robot
41ac6310b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future
2024-09-11 23:07:15 +00:00
Bill Yi
ffd51906c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: feee29caf8
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3262006
Change-Id: I5a82f9cc705d725f3c000fec95f181cc27d76bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:28 +00:00
Bill Yi
1d89705c11
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 905e347339
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3262006
Change-Id: I123d9f94f21772c268f4ab114ee89e0cdadfd3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:22 +00:00
Bill Yi
7fe805ba53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 110375b901
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260548
Change-Id: Ic89b524acd5125ca3220e0bbcfaaeb7fd678ef6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:18 +00:00
Bill Yi
1ecafa4265
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65d9c39a51
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260548
Change-Id: Ide486ac722c55d598195a8dfb003e3d9cb1b62f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 23:00:10 +00:00
Bill Yi
e642348450
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: ce0fa685e4
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260547
Change-Id: I57344ae5ccb4e7c0d854ce6c3a915e69b2054a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 22:59:59 +00:00
Bill Yi
3dbd7c54bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 730b913bc6
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3260547
Change-Id: I21289bfbdaa4ff581272f87cc6b626bc12a05ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 22:59:52 +00:00
Bill Yi
feee29caf8
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-09-11 22:30:21 +00:00
Bill Yi
110375b901
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-09-11 22:30:21 +00:00
Bill Yi
ce0fa685e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-09-11 22:30:21 +00:00
Bill Yi
83f6b71ae7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie36b23e48077023708c6a7bf895ae49ecd4ee099
2024-09-11 13:48:32 -07:00
Bill Yi
ecccb8c92f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4da9179b61e9fb32525708c49bd26a208754d65a
2024-09-11 13:46:06 -07:00
Bill Yi
1d24d09091
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7a6d17a7356827e2d823fa8f3e9fb312c5d210b
2024-09-11 13:44:14 -07:00
Bill Yi
65d9c39a51
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If28bc3a57b9e98862b7f7fd5bc57167171e6009d
2024-09-11 12:07:00 -07:00
Bill Yi
905e347339
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9205a5ec80240c5ca11946c6e03b4b0e11769c83
2024-09-11 12:05:13 -07:00
Bill Yi
730b913bc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I40a62c487bc7916eac67a878a59ce68a2139c694
2024-09-11 12:03:50 -07:00
Treehugger Robot
bdd44e5242
Merge "Fix errorprone issues" into main am: eb2e9e4776
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258078
Change-Id: Idaa9fc8fe53588c16959948de0f32ab74d5187ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 18:13:59 +00:00
Treehugger Robot
d459385feb
Merge "Make java_sdk_library dependencies explicit" into main am: dd578b8274
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3247681
Change-Id: I367d149d944129e2c545bde70690733a235cae5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 18:10:52 +00:00
Treehugger Robot
eb2e9e4776
Merge "Fix errorprone issues" into main
2024-09-11 18:08:19 +00:00
Treehugger Robot
dd578b8274
Merge "Make java_sdk_library dependencies explicit" into main
2024-09-11 17:58:59 +00:00
Jihoon Kang
4ae6ead8d6
Make java_sdk_library dependencies explicit
...
modules should specify the submodule of java_sdk_library that the module
actually depends on
Test: CI
Bug: 358613520
Merged-In: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
Change-Id: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
2024-09-10 22:43:05 +00:00
Chun-Wei Wang
6eccd73996
Merge "Support alternate button" into main am: 88bbe8fe1d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020
Change-Id: I875a923cac31bd561ff5a1cbf80000d6a1c3803e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-09 14:26:02 +00:00
Chun-Wei Wang
88bbe8fe1d
Merge "Support alternate button" into main
2024-09-09 14:18:11 +00:00
Xin Li
d47d22ecaf
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3efb972a55
-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: Idfb56e083de5edfc54c71641994bb56d0903e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-07 02:27:57 +00:00
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