Pawan Wagh
3abf3a0f8c
Merge "Integration tests for 16kb dev option" into main
2024-06-05 02:53:06 +00:00
Chris Antol
03e59a0827
Merge "Ignore fragment attr from ext authenticator resource" into main
2024-06-05 02:01:07 +00:00
Pawan Wagh
0dbc009db1
Add Enable16KbTest to TEST_MAPPING
...
Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: I92bf4a92dcb9fed4d4ae3cb35f6032b095a640d3
2024-06-04 23:12:39 +00:00
Pawan Wagh
10ff699b99
Integration tests for 16kb dev option
...
Adding tests to verify end to end functionality for dev options.
This test verifies
- /data reformatting to ext4
- switching to 16kb kernel
- switching back to 4kb kernel
- Persistent notifications in page-agnostic mode
- Disabling developer option in page-agnostic mode
Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: Ieaa149831b5205a15b259982f0349dc94d4fae92
2024-06-04 23:11:37 +00:00
Quang Anh Luong
dda3dd56cb
Gate dhcp hostname setting behind Wifi V API flag
...
DCHP hostname setting should only be shown if the feature flag for Wifi
V API is enabled.
Bug: 341981620
Test: manual
Change-Id: Iee3740db2513c7071c14361513f7e51199245af0
2024-06-04 22:59:23 +00:00
David Jacobo
19a96c7cbd
Revert "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SE..."
...
Revert submission 27518747-revert-27019285-ACTION_NETWORK_PROVIDER_SETTINGS-UWYYODXDGG
Reason for revert: per b/338527563#comment37, this was wrongly pointed out as culprit, looping folks conducting investigation as +cc
Reverted changes: /q/submissionid:27518747-revert-27019285-ACTION_NETWORK_PROVIDER_SETTINGS-UWYYODXDGG
Change-Id: Id3dfdac978227d0fd065f1eb59b525f041fad3d2
2024-06-04 22:35:00 +00:00
Joshua Mccloskey
b74153739a
Merge "Changed face/finger enroll intro no thanks" into main
2024-06-04 22:19:13 +00:00
Mady Mellor
34677c7b08
Maybe fix NPE - don't notifyChange if selected visibility is the same
...
Flag: none / bugfix
Test: none / can't repro
Test: manual - switch between the different radio buttons in bubble settings to make sure they
all work
Bug: 343167554
Change-Id: I19fc3fa0df59c44e3f22de035c0b377caea1158f
2024-06-04 20:25:11 +00:00
Chris Antol
7e0b376b11
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:42 +00:00
Chris Antol
f5e9b0167a
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:32 +00:00
Chris Antol
24e2f2d2f6
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:14 +00:00
Chris Antol
e2dc98c21d
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:15:53 +00:00
Chris Antol
abf11e7350
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:15:21 +00:00
Chris Antol
d43f82be7a
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:14:58 +00:00
Chris Antol
8607f3a34e
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:13:51 +00:00
Joshua McCloskey
c87a49fe69
Changed face/finger enroll intro no thanks
...
Changed the face & fingerprint enroll introduction to use "Not now"
instead of "No thanks" during enrollment.
Test: Manually verified the strings that showed up during
face/fingerprint enrollment were correct
Fixes: 302662735
Change-Id: I66183febae1cc36d4bfb2f67e70a3f37a887369c
2024-06-04 19:05:47 +00:00
Treehugger Robot
a91316d418
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a10b64bebd
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27662035
Change-Id: If9ea349e76aa87cf480173609eaed251236ab756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:41 +00:00
Bill Yi
0ee5bac2a4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce35a584c3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27662035
Change-Id: If00bf2a36869b41af9d2a1824eede1beeabc43ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:34 +00:00
Treehugger Robot
33e7ed1759
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a380ca7e3d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661293
Change-Id: Ifdd8e2d66510504c924ad99fdc687d0b58a3d01d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:31 +00:00
Bill Yi
cda5dae905
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cf00bfd93
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661293
Change-Id: I93f8fef4685c56f307a9b9a191e6543da7c90d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:22 +00:00
Bill Yi
f14a11e963
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5fb325d35d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661289
Change-Id: I006f4a157b3149c7e346c97bdadd44af478fe893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:31:18 +00:00
Treehugger Robot
b13e43b980
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: db26a77b37
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661146
Change-Id: Ib1d4d358a0d728adc1c92aee4290159a6590b607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:22:04 +00:00
Bill Yi
1877fbdc66
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 994dc22a81
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661146
Change-Id: I6e1687d0db7b57f7fed90552d5231d3463d484c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:21:58 +00:00
Bill Yi
5085a052c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53d3d950dc
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27661777
Change-Id: If6f78bfd0803dad0c239169fd609b2ecaf5cc3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-04 18:21:07 +00:00
Treehugger Robot
a10b64bebd
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-06-04 18:12:07 +00:00
Treehugger Robot
a380ca7e3d
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-06-04 18:12:07 +00:00
Treehugger Robot
db26a77b37
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-06-04 18:11:48 +00:00
Nate Myren
d7de057fd2
Merge "Convert clipboard access to use new APIs" into main
2024-06-04 18:09:00 +00:00
Treehugger Robot
467962202e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-06-04 18:04:36 +00:00
Treehugger Robot
30299b5b51
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-06-04 18:04:36 +00:00
Treehugger Robot
1d6419f8c6
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-06-04 18:04:36 +00:00
Chun-Ku Lin
557659277f
Merge "Load icon in the background, also load extra data that would be used later in the background." into main
2024-06-04 17:16:23 +00:00
Chris Antol
2cb9b10ed9
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 17:06:26 +00:00
Yomna Nasser
23377dcf4c
Merge "Remove unneeded init & displayPreference functions" into main
2024-06-04 16:36:13 +00:00
Jason Hsu
b300ecff43
Merge "Update 'Preset' to singular" into main
2024-06-04 16:28:17 +00:00
jasonwshsu
452cfdc39d
Update 'Preset' to singular
...
Bug: 344832549
Test: check string in Device details page when pairing with hearing aids
Flag: EXEMPT resource only update
Change-Id: I11f892065131680723793f5ac652e11fce0b21ec
2024-06-04 21:14:49 +08:00
Chaohui Wang
7030928506
Merge "Finish mobile settings if sub id not exists" into main
2024-06-04 12:46:08 +00:00
YK Hung
855681fa8f
Merge "Fetch the original battery optimization mode in backup & restore process." into main
2024-06-04 10:28:37 +00:00
YK Hung
d76f5b8233
Merge "Fix post-comment in ag/27593647 to improve the readability." into main
2024-06-04 10:25:00 +00:00
Chaohui Wang
28f51a934a
Merge "[Apn] Copy network type into lingering network type" into main
2024-06-04 10:16:13 +00:00
Chaohui Wang
3ad527640e
Finish mobile settings if sub id not exists
...
Could be test with,
adb shell am start \
-a android.settings.NETWORK_OPERATOR_SETTINGS \
--ei android.provider.extra.SUB_ID 999
Bug: 336232487
Test: manual - on MobileNetworkSettings
Change-Id: I74d5d5b743c40375ceba1ba6e761da901d0d5e65
2024-06-04 18:15:24 +08:00
Chelsea Hao
035efe6207
Merge "[Audiosharing] Clean up unused code." into main
2024-06-04 09:35:38 +00:00
mxyyiyi
00507a47ec
Fix post-comment in ag/27593647 to improve the readability.
...
Bug: 338965652
Test: atest + manual
Change-Id: I8e4c8a4508dd8c5afd1f16c6129146ba6e13bde2
2024-06-04 15:48:36 +08:00
Quang Luong
d65e37e8a8
Change hotspot security to WPA3-Transition when switching from 6GHz
...
When changing hotspot to 6GHz, we auto-set the security to WPA3-SAE. However, we don't do the reverse when changing out of 6GHz, which may cause legacy devices to be unable to connect. Instead, always revert back to WPA3-Transition when switching out of 6GHz.
Bug: 323764310
Test: manual
Change-Id: I06b1e97f452da86a693812a6620c251ff5d0e932
2024-06-04 07:48:16 +00:00
mxyyiyi
1767a6ebb8
Fetch the original battery optimization mode in backup & restore process.
...
- Battery optimization mode maybe temporary updated by turbo.
Bug: 338965652
Test: atest + manual
Change-Id: Ibea7ecc85ee7d042058f1bccc043fa501be2b8db
2024-06-04 15:43:58 +08:00
Xinyi Mao
d6fe83b86e
Merge "Fix color_hook broken in repo upload caused by ag/27381753." into main
2024-06-04 07:37:27 +00:00
chelseahao
4c94930ad5
[Audiosharing] Clean up unused code.
...
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostreams
Bug: 308368124
Change-Id: Iea1aede53aefe2034b5a083ff503bb21a4f546cb
2024-06-04 07:09:03 +00:00
Chaohui Wang
57956a8bb8
[Apn] Copy network type into lingering network type
...
The lingering network type is actually the bit that controls network
torn down. UNKNOWN here means the APN can work on any RAT.
Just copy network type into lingering network type, so network torn down
can work normally.
Fix: 341006308
Test: unit test
Change-Id: Ia60ad3e012bec7364aa35535de1363cd7c0ccdda
2024-06-04 13:58:36 +08:00
Treehugger Robot
70b0a36c4b
Merge "Modify the incorrect wording" into main
2024-06-04 05:11:19 +00:00
chelseahao
61397099b8
Update auto on text.
...
Test: atest
Bug: 339681774
Change-Id: I9c7d013b7d1615c04b26b98bb3408f56406a5ee0
2024-06-04 12:59:51 +08:00