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
Treehugger Robot
88f79fe29d
Merge "Migrate to onViewCreated in DataSaverSummary" into main am: 04ed8498ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3188139
Change-Id: Ib0e4725e3b490e70d9518a2f02c418de2216e638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-28 21:06:34 +00:00
Treehugger Robot
04ed8498ee
Merge "Migrate to onViewCreated in DataSaverSummary" into main
2024-07-28 20:52:34 +00:00
Treehugger Robot
ee6f5cf1ed
Merge "Make adb team OWNERS of all Adb settings" into main am: 998787ffa8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3195878
Change-Id: Idcd085b62b69bace7ddfda325b1645b6b89440ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 18:25:24 +00:00
Treehugger Robot
998787ffa8
Merge "Make adb team OWNERS of all Adb settings" into main
2024-07-26 18:01:59 +00:00
Fabien Sanglard
c7adef9634
Make adb team OWNERS of all Adb settings
...
Test: NA
Bug: 355088188
Flags: NA
Change-Id: I59c037765940a26509f1d312b4c8c2e0105a3580
2024-07-26 10:57:43 -07:00
Android Build Coastguard Worker
19f1485831
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27918880', 'googleplex-android-review.googlesource.com/28027477', 'googleplex-android-review.googlesource.com/28326671'] into 24Q3-release.
...
Change-Id: Id237df0d96a112e47b00d5f9ba0884e99f935c86
2024-07-26 02:16:27 +00:00
yomna
a6149ddf36
Remove searchability of CellularSecuritySettingsFragment
...
Test: m & manual
Bug: b/335554085
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:62004763e1f131085b0e834b6c8b01b563f55b73 )
Merged-In: Ia226b0848d70a307b80060049ec24b9714ee476a
Change-Id: Ia226b0848d70a307b80060049ec24b9714ee476a
2024-07-26 02:04:26 +00:00
Haijie Hong
8822907513
Add device to to cached device manager if it's not present
...
Bug: 346923808
Test: atest BluetoothDeviceDetailsFragmentTest
Flag: EXEMPT minor bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a074f274991f6a172855e0253f49b0a6dd63c758 )
Merged-In: Ia4987bc7ec93cb6b54d188922b7232d83d528f2f
Change-Id: Ia4987bc7ec93cb6b54d188922b7232d83d528f2f
2024-07-26 02:04:14 +00:00
Rambo Wang
a07738266b
Fix Settings restart during Reset mobile nework settings flow
...
This CL avoids restarting Settings in the reset mobile flow when phone
process is restarted, by switching the usage of the stable content
provider connection to the unstable client.
The CL also arranges restarting phone process as the last reset
operation in the flow (later than RILD reset) to avoid any reset
operation get impacted by phone process restarting.
Since the permission to protect the TelephonyContentProvider has been
renamed, the CL also renames the requsted permision.
Bug: 347047105
Test: atest ResetNetworkOperationBuilderTest
Test: Reset mobile network feature test
Flag: EXEMPT resource update with minor refactoring
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ac9d9c8fa0005f787b75052010dcc9935efcb4f )
Merged-In: I7bfa79bc9d7451a4a03269704b0009a3730e287f
Change-Id: I7bfa79bc9d7451a4a03269704b0009a3730e287f
2024-07-26 02:03:55 +00:00
Yuanru Qian
6190b5eb70
Merge "Developer option crashed when Bluetooth feature disabled" into main am: cff856a8bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3172099
Change-Id: Idaa295aa767f900acc88da42bc838b7081c69504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 04:29:10 +00:00
Yuanru Qian
cff856a8bb
Merge "Developer option crashed when Bluetooth feature disabled" into main
2024-07-25 03:31:43 +00:00
Yuanru Qian
97f922d60c
Merge "Remove ex-team members from OWNERS" into main am: 8303a38d10
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191891
Change-Id: I39c450800b0a3fc08d7cab8e74ff7318f753cbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 10:27:41 +00:00
Yuanru Qian
8303a38d10
Merge "Remove ex-team members from OWNERS" into main
2024-07-24 10:06:07 +00:00
Yuanru Qian
3fac9ad21b
Remove ex-team members from OWNERS
...
Change-Id: I025d4963e5b63a28fb0fe36df8a4e1fdd76a9b3d
2024-07-24 09:41:31 +00:00
Pawan Wagh
d519d1fbaa
Remove unecessary logs
...
Test: m Settings
Bug: N/A
Flag: NONE remove logging
Change-Id: Ib1e5923e2f10fdf5fa29bbaa24b74874c18c3045
2024-07-23 22:19:22 +00:00
chayemme
ec6e93f3f4
Developer option crashed when Bluetooth feature disabled
...
When Bluetooth feature is disabled, crash observed with developer option
is selected
Bug: 352864331
Change-Id: If4239f710847f2e01a3b419e1ce6f783f0522219
2024-07-23 13:05:29 +00:00
Ram Peri
119d1e9f43
Merge "Robolectric upgrade" into main am: 71b2be5571
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3185301
Change-Id: I9469f534e375c589f0a7dbac20f185f61ae69295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 01:08:54 +00:00
Ram Peri
71b2be5571
Merge "Robolectric upgrade" into main
2024-07-23 00:28:56 +00:00
Ram Peri
f5b58ea3be
Robolectric upgrade
...
Test: atest SystemUIGoogleRoboRNGTests
Flag: TEST_ONLY
Change-Id: I833ac67223875480994f947907754290bb25c946
2024-07-22 13:48:09 -04:00
Jyotiraditya Panda
4ff23211dd
Migrate to onViewCreated in DataSaverSummary
...
The onActivityCreated method has been deprecated. This change updates
DataSaverSummary to use onViewCreated instead, which is the recommended
method for initializing views after the fragment's view has been created.
Test: manual
Change-Id: I08daa11b557b05441fa4f7ed0019802d991846e3
Signed-off-by: Jyotiraditya Panda <jyotiraditya@aospa.co >
2024-07-22 20:18:08 +05:30
Android Build Coastguard Worker
768511b956
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28036491'] into 24Q3-release.
...
Change-Id: Ife612928a2651d27322d7a4da6ad469b530759e4
2024-07-20 07:19:36 +00:00
David Anderson
80e709f926
Allow overriding DeviceDiagnosticsPreferenceController.
...
Allow devices to specify their own flags by overriding this class.
Additionally, fix a missing PackageManager lookup in getIntent().
Bug: 348647186
Test: launch Settings on Pixel and on AOSP
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:287181169485eb30203c7b698b1f8ee618059e29 )
Merged-In: I2489a64804f068a957f9be3f87847d6911b24447
Change-Id: I2489a64804f068a957f9be3f87847d6911b24447
2024-07-20 07:05:32 +00:00