Commit Graph

141398 Commits

Author SHA1 Message Date
Paul Duffin
ad48f03f53 Fully qualify @attr reference to android.R field
Currently, Metalava has some special handling of '@attr ref R.<field>`
references to make sure that they are fully qualified, i.e.
`@attr ref android.R.<field>`. That special handling complicates
Metalava and is blocking some flagged API work so will be removed.
Before that can be done, the existing incorrect documentation needs to
be cleaned up.

This change cleans up those cases in this repo.

Bug: 371997321
Test: Run `m offline-sdk-docs` before and after to make sure that
      there are no differences.
Flag: DOCS_ONLY
Change-Id: Ic97f01b90193d058d65e6d3c6d0a04ce5e55d7c7
2024-10-07 17:10:02 +01:00
Treehugger Robot
9a0ba22e79 Merge "Add a check to ensure that intent data is available before proceeding." into main 2024-09-27 09:54:21 +00:00
Treehugger Robot
12f2e1cf4f Merge "Use hasScrollAction in ApnEditPageProviderTest" into main 2024-09-26 10:54:50 +00:00
Treehugger Robot
6a4fb45e38 Merge "Protect the Settings application from potential null pointer exceptions." into main 2024-09-26 10:30:43 +00:00
Chaohui Wang
bb1cadb916 Use hasScrollAction in ApnEditPageProviderTest
Instead of assuming a fixed tree structure in testing.

Fix: 369416630
Flag: EXEMPT gradle only
Test: atest ApnEditPageProviderTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0b530fd405eb95dfedf51bc55bc24bd7d446ead8)
Merged-In: I0a50e7665d9049e089b5a0877f17d1f736ee3332
Change-Id: I0a50e7665d9049e089b5a0877f17d1f736ee3332
2024-09-26 10:20:38 +00:00
Abdelrahman Daim
996afd17a1 Protect the Settings application from potential null pointer exceptions.
Summary: The app bar is not available, causing a null pointer exception.

Test: Successful Build on master branch

Change-Id: I36849606f6587d6e7f004ae21e1a6e6a5206735a
Signed-off-by: Abdelrahman Daim <adaim@meta.com>
2024-09-25 17:02:37 -07:00
Abdelrahman Daim
3be2314fac Add a check to ensure that intent data is available before proceeding.
Summary: There are instances where intent data is absent, leading to a crash while trying to retrieve the schema. This change adds a null check to prevent attempted access when there's no data.

Test: Successful Build on master branch

Change-Id: Ie83bd3243f2c79102061d3fa43d809b3ef3c6c78
Signed-off-by: Abdelrahman Daim <adaim@meta.com>
2024-09-24 12:21:22 -07:00
Treehugger Robot
fdbd2d1090 Merge "Fix errorprone issues" into main 2024-09-17 21:38:22 +00:00
Cole Faust
784411fc25 Fix errorprone issues
IgnoredPureGetter, LenientFormatStringValidation, ProtocolBufferOrdinal, and ReturnValueIgnored.
https://errorprone.info/bugpatterns

Bug: 253827323
Test: RUN_ERROR_PRONE=true m javac-check
Change-Id: I9975c8689c9d673d0b676c60d68ccec1953470f8
Merged-In: Ia0e16b8be5284d13bed4366cbee0f92748bf2f85
2024-09-17 14:08:00 -07: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
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
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
88bbe8fe1d Merge "Support alternate button" into main 2024-09-09 14:18:11 +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