Zhibin Liu
7c598253ff
Merge "Add support to configure state of operator name in status bar [2/2]" into main
2025-03-24 00:15:24 -07:00
Kevin Liu
a519bd5654
Merge "Fix the deprecated directlyOn method" into main
2025-03-20 08:18:59 -07:00
Treehugger Robot
08906d9c93
Merge "Fix test failed of SatelliteSettingsPreferenceControllerTest" into main
2025-03-20 05:14:49 -07:00
Tom Hsu
2e6be73789
Fix test failed of SatelliteSettingsPreferenceControllerTest
...
- This was fixed already. To avoid keeping failed here, make a work around to this test file.
Flag: EXEMPT bug fix
Fix: 404551954
Test: presubmit pass
Change-Id: I7e6d787a51991525c344a502fbf33b9ca6251667
Merged-In: Icf82dab5a497304df9c3e6a8159e5806ac687445
2025-03-20 04:27:01 -07:00
Treehugger Robot
4f52f40cf9
Merge "Fix force close in WiFi API test code" into main
2025-03-19 03:04:14 -07:00
Bharath
7aa330d5ab
Add support to configure state of operator name in status bar [2/2]
...
This keeps the Settings entry under Display Settings for
Operator name in Status bar to be configurable.
Bug: 399826221
Test: atest SettingsRoboTests:com.android.settings.display.ShowOperatorNamePreferenceControllerTest
Change-Id: I6a7777868175e6970f28060a6d74c70f582ca770
2025-03-18 01:57:03 -07:00
Kevin Liu
99b5a00f83
Fix the deprecated directlyOn method
...
Adjust to directlyOn method with method string and parameter type
Test: atest SettingsRoboTests
Change-Id: Ia15a8a722e6c8387b639da096377d9716a944b7e
2025-03-14 22:45:39 +00:00
Treehugger Robot
fc564f2bd1
Merge "Fix typo when execute query on BiometricSettingsProvider" into main
2025-03-11 18:21:58 -07:00
hoffc
6bafe1b1c0
Fix force close in WiFi API test code
...
Enable WiFi network with empty net id, force close will occur.
Add number format exception catch when parsing net id.
Bug: 402260924
Change-Id: I540fdeddc7072e7a9414ac7f9d7aca348d06cd30
2025-03-11 12:28:10 +08:00
Treehugger Robot
7d6225d0a4
Merge "Reduce storage requirement for Terminal App" into main
2025-03-10 19:29:41 -07:00
Xin Li
9e67fd6d31
Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main
2025-03-10 09:50:09 -07:00
Shen Lin
7a5269b187
Fix typo when execute query on BiometricSettingsProvider
...
Bug: b/387226842
Change-Id: I64f8352fd613c6a680fc32f81d6815e440458566
Test: presubmit
2025-03-09 09:12:41 -07:00
Xin Li
7d6276b890
Merge 25Q1 (ab/BP1A.250305.020) to AOSP main
...
Bug: 385190204
Merged-In: Ib124aa795277d5e1d66f3a98a16ab9bf1cfbe08f
Change-Id: I4844bd4b5b3c6bfc9ee0b2baac872e0a68b14f84
2025-03-08 16:09:55 -08:00
Xin Li
10d930d1cf
Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future
...
Bug: 385190204
Merged-In: I04f90b42907d07c6111a7b41a531f7717df33672
Change-Id: I58e92a6e45193de820f7432dcb365c41c14d3141
2025-03-06 12:22:41 -08:00
Justin Yun
48b13e5cb1
Revert "Replace system_ext container with system"
...
This reverts commit 6e1b274f03 .
A system partition cannot have the aconfigs of other partitions.
Revive the system_ext container for system_ext aconfigs.
Bug: 385213580
Test: "adb shell aflags list" must not be changed.
Flag: EXEMPT refactor
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1337a88d112b005f897b3745b5475cf7d4764db7 )
Merged-In: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
Change-Id: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
2025-03-02 14:31:20 -08:00
Ronald Braunstein
b84bb949f2
Merge "[owners] Remove curtislb@google.com from src/com/android/settings/password/OWNERS" into main am: e71f6991e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3510415
Change-Id: I9125dced0a067fb2a2badae1b7e06f5b55b0b1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-28 08:24:37 -08:00
Ronald Braunstein
e71f6991e2
Merge "[owners] Remove curtislb@google.com from src/com/android/settings/password/OWNERS" into main
2025-02-28 07:55:24 -08:00
Owner Cleanup Bot
8203d7a8b2
Merge "[owners] Remove zachoverflow@google.com from src/com/android/settings/nfc/OWNERS" into main am: 12abcbc552
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3515715
Change-Id: I94952bc03b112cde94d01681f919e98d03716b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-28 06:47:37 -08:00
Owner Cleanup Bot
12abcbc552
Merge "[owners] Remove zachoverflow@google.com from src/com/android/settings/nfc/OWNERS" into main
2025-02-28 06:20:49 -08:00
Owner Cleanup Bot
6c9b73b30b
[owners] Remove zachoverflow@google.com from src/com/android/settings/nfc/OWNERS
...
This suggested change is automatically generated based on group
memberships and affiliations.
Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy. We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain. It can always be
reverted if needed.
If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.
See the owner's recent review activity for context:
https://android-review.googlesource.com/q/zachoverflow@google.com
To report an issue, file a bug in the Infra>Codereview component.
Change-Id: I920d4ea8771b3d5e5b919ca8102291acf2ba48f6
2025-02-27 17:13:36 -08:00
Xin Li
911fdcebcf
Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future
2025-02-27 15:24:25 -08:00
Kevin Liu
7cef5ae136
Merge "Revert "Temp disable test that contains custom shadow within it"" into main am: 4d38f48c68
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3510292
Change-Id: I03092ac9c274be39c4168b4e985a1c10a61973c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-27 07:58:53 -08:00
Kevin Liu
4d38f48c68
Merge "Revert "Temp disable test that contains custom shadow within it"" into main
2025-02-27 07:29:29 -08:00
Owner Cleanup Bot
c8295c05f8
Merge "[owners] Remove saumyap@google.com from src/com/android/settings/privatespace/OWNERS" into main am: 2c6604de6b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3417820
Change-Id: I9c3643fff40d73534bd127dab9e011d9c6fe1aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-27 06:43:46 -08:00
Owner Cleanup Bot
2c6604de6b
Merge "[owners] Remove saumyap@google.com from src/com/android/settings/privatespace/OWNERS" into main
2025-02-27 06:13:12 -08:00
Treehugger Robot
48fa52217c
Merge "Remove jaggies@google.com from src/com/android/settings/password/OWNERS" into main am: 6893a9d5e3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2957653
Change-Id: Ibefe578a92c05de365bafd5662c7f4678b7f1428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-26 12:10:02 -08:00
Xin Li
5bfde9fbf5
Merge 25Q1 (ab/12770256) to aosp-main-future
...
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
2025-02-26 11:59:26 -08:00
Treehugger Robot
6893a9d5e3
Merge "Remove jaggies@google.com from src/com/android/settings/password/OWNERS" into main
2025-02-26 11:48:11 -08:00
Kevin Liu
78e05bbcec
Revert "Temp disable test that contains custom shadow within it"
...
This reverts commit a9e22be8a5 .
Reason for revert: No longer need to ignore this test, as the root cause is found and fixed in aosp/3506812
Change-Id: I56681bde8c0485c46f0cd2b84cb83fee5ea0e760
2025-02-26 11:04:50 -08:00
Owner Cleanup Bot
a1a3b10c4f
[owners] Remove curtislb@google.com from src/com/android/settings/password/OWNERS
...
This suggested change is automatically generated based on group
memberships and affiliations.
Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy. We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain. It can always be
reverted if needed.
If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.
See the owner's recent review activity for context:
https://android-review.googlesource.com/q/curtislb@google.com
To report an issue, file a bug in the Infra>Codereview component.
Change-Id: I8ad909d8454a59de529ead3af94d503427efad2b
2025-02-26 09:42:02 -08:00
Treehugger Robot
188402ad16
Merge "[owners] Remove clairewang@google.com from src/com/android/settings/fuelgauge/protos/OWNERS" into main am: 30d4456166
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3319554
Change-Id: I78cae04000aa905d14a061fcf04ca8aa6154778b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-25 13:35:23 -08:00
Treehugger Robot
30d4456166
Merge "[owners] Remove clairewang@google.com from src/com/android/settings/fuelgauge/protos/OWNERS" into main
2025-02-25 13:02:39 -08:00
Treehugger Robot
851c8a5ff6
Merge "Use SwitchPreferenceCompat for UI consistency" into main am: 77f21a8d0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3502129
Change-Id: I932bcbfd0f9b444ec87de09bfbf1eb57ebdfe803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-24 18:29:19 -08:00
Treehugger Robot
77f21a8d0a
Merge "Use SwitchPreferenceCompat for UI consistency" into main
2025-02-24 18:12:06 -08:00
Owner Cleanup Bot
59781d008c
Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main am: b384fe708b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3504631
Change-Id: I179e8b48c9fb0943714de02ed4b8ca2e9d1de7bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-24 06:58:52 -08:00
Owner Cleanup Bot
b384fe708b
Merge "[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS" into main
2025-02-24 06:26:16 -08:00
Owner Cleanup Bot
125a6223af
[owners] Remove zhangjerry@google.com from src/com/android/settings/connecteddevice/usb/OWNERS
...
This suggested change is automatically generated based on group
memberships and affiliations.
Please approve this change and vote the highest CR. This will keep the OWNERs
file tidy. We ask that you do not ignore this change and approve it
unless you know a reason the OWNER should remain. It can always be
reverted if needed.
If this change is in error, vote the lowest CR value (i.e. reject the CL)
and the bot will abandon it.
See the owner's recent review activity for context:
https://android-review.googlesource.com/q/zhangjerry@google.com
To report an issue, file a bug in the Infra>Codereview component.
Change-Id: Icfd162bf283cf74e3270d97a8ac15dcb2dfb34d3
2025-02-22 09:05:23 -08:00
Owner Cleanup Bot
1a2021fe66
Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main am: f16b9f85a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3499870
Change-Id: If51ca705603b0f00e776f7c2b98ee12c0dccaaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-21 11:45:37 -08:00
Owner Cleanup Bot
62651fd633
Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main am: 0d7517c021
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497484
Change-Id: I3d477b780ba85e4c214de837b6bbab425b13aff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-21 11:45:24 -08:00
Owner Cleanup Bot
01d42a8f16
Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main am: f7457e99a2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3497483
Change-Id: Ibab36faa75e1d4c187af9d674ccecfe1575413b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-21 11:44:00 -08:00
Owner Cleanup Bot
f16b9f85a1
Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/sim/OWNERS" into main
2025-02-21 11:15:59 -08:00
Owner Cleanup Bot
0d7517c021
Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/deviceinfo/OWNERS" into main
2025-02-21 11:13:55 -08:00
Owner Cleanup Bot
f7457e99a2
Merge "[owners] Remove bonianchen@google.com from src/com/android/settings/datausage/OWNERS" into main
2025-02-21 11:13:51 -08:00
Owner Cleanup Bot
1ea637ca4b
Merge "[owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS" into main am: 0997a62f67
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3503652
Change-Id: I7e14c37e2529e6ae8a9497eb7dd58155dd84a1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-21 06:44:48 -08:00
Owner Cleanup Bot
0997a62f67
Merge "[owners] Remove arcwang@google.com from src/com/android/settings/wifi/OWNERS" into main
2025-02-21 06:25:48 -08:00
Pawan Wagh
1c2464aae4
Merge "16KB -> 16 KB" into main am: 63a8931a41
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3501682
Change-Id: If770afce411e6692848b2308239c626a53803c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-20 19:49:11 -08:00
Pawan Wagh
60c7026389
Merge "Connect and enable root before running each testcase" into main am: b03384d426
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3501231
Change-Id: I4e5e5500d64199e2c4a77a2d643d7131cbe7ef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2025-02-20 19:48:46 -08:00
Pawan Wagh
63a8931a41
Merge "16KB -> 16 KB" into main
2025-02-20 19:28:35 -08:00
Pawan Wagh
b03384d426
Merge "Connect and enable root before running each testcase" into main
2025-02-20 19:28:03 -08:00
Pawan Wagh
602cec999b
Use SwitchPreferenceCompat for UI consistency
...
Test: Install Settings and Check UI
Bug: N/A
Change-Id: Idf17d4d7616b6d45403e1c19857f5a33b27b04c2
2025-02-21 01:24:42 +00:00