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
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
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
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
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
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
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
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
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
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
SongFerng Wang
bce8fc79e8
Merge "Fix SmartForwardingActivity crash at screen rotation" into main am: 14393a5f06
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2855525
Change-Id: Ieb6ffb8c2f479ffcc30d60440df649618074e420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-19 05:55:14 +00:00
SongFerng Wang
14393a5f06
Merge "Fix SmartForwardingActivity crash at screen rotation" into main
2024-07-19 05:41:40 +00:00
SongFerng Wang
e910d895f1
Merge "Settings: Adapt edge-to-edge enforcement" into main am: 9befb6cd8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3142636
Change-Id: Ibfc5f8fb007d93d618c4a0c67e396677329b5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-18 09:48:49 +00:00
SongFerng Wang
9befb6cd8f
Merge "Settings: Adapt edge-to-edge enforcement" into main
2024-07-18 09:31:55 +00:00
Tom Hsu
72541b8b19
Merge "Fix network can't handle simultaneously SS request for both subs" into main am: f20f297cfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2643178
Change-Id: Id6f676ba5fe1ae096c6b3ed0ed75a00e2c1d92e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 07:13:32 +00:00
Tom Hsu
f20f297cfa
Merge "Fix network can't handle simultaneously SS request for both subs" into main
2024-07-17 06:56:04 +00:00
Edgar Wang
ff519515b6
Merge "Add Multiuser team to the OWNERS file for users package in Settings" into main am: 969c26392d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3176079
Change-Id: Id9f83a06f922904ddf56ed803fa58cd362eba59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-17 01:13:36 +00:00
Tetiana Meronyk
c641849a42
Add Multiuser team to the OWNERS file for users package in Settings
...
Bug: 352721898
Change-Id: Ica47025c4ba5033a15422931fd9f8ed85ae97e9e
Test: N/A
2024-07-16 12:05:25 +00:00
Zaiyue Xue
dc841cd077
AiCore reattribute feature
...
Bug: 344438848
Bug: 346706894
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:164e2be9380ef0df6afe7616fb0bedc8eea6f899 )
Merged-In: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
Change-Id: Ifb18c2d156d11fcfdc67cff575ba800c4a6cc0fe
2024-07-11 04:25:14 +00:00
Haijie Hong
3ecc4b93bb
Determine Spatial Audio AudioDeviceAttributes by BT profile state
...
Test: atest BluetoothDetailsSpatialAudioControllerTest
Bug: 341005211
Flag: com.android.settingslib.flags.enable_determining_spatial_audio_attributes_by_profile
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4296b30dcf879701a9bf614b37b45d5f1d886fe4 )
Merged-In: I1436019d239414c3855d506dcf35d736c8428e0a
Change-Id: I1436019d239414c3855d506dcf35d736c8428e0a
2024-07-10 05:15:33 +00:00
Treehugger Robot
f7486fc4a5
Merge "Repost PageAgnostic mode notification when dismissed" into main am: 9a492ca3cb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160058
Change-Id: Ia7ae95a0988aa1e63669af5485ca25ef31993c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-09 17:40:34 +00:00
Treehugger Robot
9a492ca3cb
Merge "Repost PageAgnostic mode notification when dismissed" into main
2024-07-09 17:27:16 +00:00
Treehugger Robot
226c0d5487
Merge "Settings: fix unexpected routing selection" into main am: a02b1c3aa2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3160065
Change-Id: I6ccacc71a9848cc2f030fb2612f3762172e893ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-05 07:17:38 +00:00
hoffc
99e33291d3
Settings: fix unexpected routing selection
...
setRouterGroupId in WifiDisplayPreferenceController will result in unexpected routing selection in MediaRouter, which will lead to WFD scanning not be triggered when entering WFD settings page if there is one remembered WFD device exists before reboot.
Remove the set group id call.
Bug: 351110755
Change-Id: I0d434543338d9896116541963f31e4669d877ea8
2024-07-04 09:02:23 +00:00
Steve Statia
5484c1e213
Fix to hide Display over other apps permission setting for the Scone
...
application.
Flag: EXEMPT bugfix
Bug: 349195999
Test: manually testing that the setting is removed from Adaptive
Connectivity Services advanced settings page.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2a3e96b4b52bd3d4a6971a5b3dd7b291aad094da )
Merged-In: I3f306d24040f500c7fed4f44309e9f58f5f766be
Change-Id: I3f306d24040f500c7fed4f44309e9f58f5f766be
2024-07-04 03:15:08 +00:00
Pawan Wagh
86a9e06419
Repost PageAgnostic mode notification when dismissed
...
Device is in experimental mode when using 16kB developer option.
When the notification is dimissed, repost it again.
Bug: 351029724
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: Ie579b6c4dd060b165c6cc8ae635d48e257d49bec
2024-07-03 22:00:45 +00:00
Alina Zaidi
7b4fcc6006
Merge "Update OWNERS for DesktopModePreferenceController" into main am: ed9bccb0b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3159736
Change-Id: I79c2dd015ce63fa0fe658daf486971f48917f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 17:37:22 +00:00
Alina Zaidi
a059eabdb3
Update OWNERS for DesktopModePreferenceController
...
Change-Id: I446525a06480a27f80e530c65181fd31f43a9ef8
Test: N/A
Flag: EXEMPT Ownership cannot be flagged
2024-07-03 16:22:23 +00:00
Pawan Wagh
fdd68f473b
Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445
Change-Id: I0c2f3c0445e06e63a26cc69efa326c8ccabf0e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 15:36:52 +00:00
Pawan Wagh
999b8a9f33
Fix flaky test for persistent notifications
...
Persistent notifications test sometimes fails due
to setup activity doesn't exit due to failed intent.
Adding setup exit command when on device tests are starting and
adding timeout for transition.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Bug: 349820489
Change-Id: Iaf1c1f481612367bbce919b27e89f88a24abb582
2024-07-02 23:57:57 +00:00
Treehugger Robot
97f101474a
Merge "Fix UI issues in localization" into main am: ce20ff98e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3151118
Change-Id: If588199369afe82c6c84a1772bba2462997a70b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-28 22:20:43 +00:00