Weng Su
2ac12d024f
Merge "Fix Wi-Fi calling test case" into main
2024-06-07 03:47:24 +00:00
Ang Li
d20d913a13
Merge "Re-enable settings password tests." into main
2024-06-07 03:21:26 +00:00
Joseph Vincent
4885f1833c
Merge "Remove temp GAIA education screen from PS setup code" into main
2024-06-07 02:47:30 +00:00
Ang Li
68f1397e1c
Re-enable settings password tests.
...
Bug: 344611440
Test: atest -c SettingsRoboTests
(http://fusion2/749378e0-712e-4817-a490-d80f044c2f37 )
Change-Id: I7d3f69df19accf9d22040706dba74ae6be304e85
2024-06-07 02:05:17 +00:00
Treehugger Robot
96a1e43d98
Merge "Loading the A11yHearingAidPreference summary in the background" into main
2024-06-07 00:26:38 +00:00
Chun-Ku Lin
b80641ba26
Loading the A11yHearingAidPreference summary in the background
...
Bug: 327052480
Flag: EXEMPT low risk bug fix
Test: atest com.android.settings.accessibility
Change-Id: I644be0c7ee289a4ea675984068ac494b97ebff68
2024-06-06 23:11:51 +00:00
Weng Su
ca13280e56
Fix Wi-Fi calling test case
...
Fix: 337417499
Flag: TEST_ONLY
Test: atest passed
atest -c NetworkProviderWifiCallingGroupTest
Change-Id: I2d57287a85075685b0bdb35a59dc8b147e90d38c
2024-06-06 21:39:00 +00:00
Xin Li
ad8021701f
[automerger skipped] Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future am: 9bf082ae01
-s ours
...
am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c08e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27555649
Change-Id: I10c5cffa58c6b723183c73bd20dd449d4f545653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 21:37:43 +00:00
Xin Li
f53ece6b3f
[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 3c3a1cc6c6
-s ours
...
am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c08e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27555649
Change-Id: I65a2176a53e8e0abc5ca9a7459577b7bb776b49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 21:36:05 +00:00
Xin Li
9bf082ae01
Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future
2024-06-06 20:54:42 +00:00
Julie Pan
7eac19fc3f
Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main am: ce2a5e07e2
am: 33e2eb32fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118591
Change-Id: I44916de88f8c594814f46d5ccd36ec910981926c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 20:15:33 +00:00
Julie Pan
33e2eb32fa
Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main am: ce2a5e07e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118591
Change-Id: I46352b557bef347fd55d89c0fbdd29d87d52c1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 19:54:52 +00:00
Julie Pan
ce2a5e07e2
Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main
2024-06-06 19:25:25 +00:00
Owner Cleanup Bot
88ab066a66
Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS
...
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote CR -1 and the bot
will abandon it. Vote CR +1/2 to approve this change.
See the owner's recent activity for context:
https://android-review.googlesource.com/q/beccahughes@google.com
To report an issue, file a bug in the Infra>Codereview component.
Change-Id: I8563f73848a4e32ff3da4b1eaf34253374d9012c
2024-06-06 17:47:53 +00:00
Treehugger Robot
08fc7f85e7
Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc
am: 8c0d308276
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923
Change-Id: Ic75ddfccfaaa1e9074c13e933e62982ed3ed9563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 17:28:54 +00:00
josephpv
d27f97393d
Remove temp GAIA education screen from PS setup code
...
With this change the temp GAIA education screen is removed from private
space setup code and adds a new loading screen with "Just a sec" title
in the activity while the gms intent in launched to fix blank screen issue.
Screenrecording link:
b/336822960#comment7
Bug: 336822960
Test: Manual
Change-Id: I9ee41835b39c194fefb970321b7a9d5a30f87306
2024-06-06 17:18:55 +00:00
Treehugger Robot
8c0d308276
Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923
Change-Id: I374aa31dde3f310e30462e82422dca679274ebee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 16:47:02 +00:00
Treehugger Robot
c3c33df4fc
Merge "Add Enable16KbTest to TEST_MAPPING" into main
2024-06-06 16:28:25 +00:00
Treehugger Robot
0a281cbbae
Merge "Fix test config" into main am: 4f19466f56
am: cd33904187
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506
Change-Id: I1541a1b2c75322c3cedb3c23a3c72b1ff894d937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 16:06:01 +00:00
Treehugger Robot
cd33904187
Merge "Fix test config" into main am: 4f19466f56
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506
Change-Id: I96194603f06e24effecbbf3f04cbea01e21e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 15:46:18 +00:00
Treehugger Robot
4f19466f56
Merge "Fix test config" into main
2024-06-06 15:35:07 +00:00
SongFerng Wang
1a2450c8cf
Merge "Show cdma network mode choices" into main am: 392f07f415
am: 5a979e94a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999
Change-Id: I0563db1d6a4d11351951d3dca82b0f2b1799b184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 14:35:51 +00:00
SongFerng Wang
5a979e94a8
Merge "Show cdma network mode choices" into main am: 392f07f415
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999
Change-Id: I61a5556361fe2109864b6e7e10d47e081930d13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 14:24:26 +00:00
SongFerng Wang
392f07f415
Merge "Show cdma network mode choices" into main
2024-06-06 14:07:58 +00:00
Chaohui Wang
b04e2d4692
Merge "Fix mSubscriptionInfoEntity NullPointerException" into main
2024-06-06 09:43:17 +00:00
Tom Hsu
c417d19839
Merge "Avoid to save result of blank input." into main
2024-06-06 08:43:37 +00:00
Quang Luong
e3fdcad6a2
Merge "Gate dhcp hostname setting behind Wifi V API flag" into main
2024-06-06 08:33:00 +00:00
Treehugger Robot
39e9aede9a
Merge "Delete "background process limit" debug option" into main
2024-06-06 07:46:23 +00:00
tomhsu
6be77d05cb
Avoid to save result of blank input.
...
- Disable "Save" button if no input or only space chars.
fix: 335763360
Test: Manual test
Test: atest pass
Change-Id: Ied5f98ec0ce7d1f38f626211cb9f465781781cd8
2024-06-06 07:27:04 +00:00
Olivier Nshimiye
736e359b49
Merge "Update the biometric unlock logo to Private Space logo" into main
2024-06-06 06:53:49 +00:00
Chaohui Wang
f2930aad5d
Fix mSubscriptionInfoEntity NullPointerException
...
Due to concurrent, mSubscriptionInfoEntity could become null when
inference.
Save the subscriptionInfoEntity to local variable to fix.
Fix: 345319514
Test: manual on MobileNetworkSettings
Change-Id: I9d286b30ade65dabdfd4a394cdbe1c1c87435d02
2024-06-06 14:26:06 +08:00
Chaohui Wang
3e650c373c
Merge "Refactor PrintSettings (1/n)" into main
2024-06-06 06:06:30 +00:00
Lynn Yeh
b96feafdf4
[automerger skipped] Merge "Restrict WifiDppConfiguratorActivity" into 24D1-dev am: 6e906fc680
-s ours
...
am skip reason: Merged-In I34afe0f698e2dc43eba59b25f5f3f4f61e70166a with SHA-1 0ea027a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27577555
Change-Id: I72cfc59e33fcd6de614b935f488d46f393ec4a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 04:36:42 +00:00
Weng Su
30a5e9dab2
[automerger skipped] Restrict WifiDppConfiguratorActivity am: 4a4131fcb3
-s ours
...
am skip reason: Merged-In I34afe0f698e2dc43eba59b25f5f3f4f61e70166a with SHA-1 0ea027a71c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27577555
Change-Id: I6a4c2163880f4d21ac6a093de8791c29f3434ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 04:36:35 +00:00
Lynn Yeh
6e906fc680
Merge "Restrict WifiDppConfiguratorActivity" into 24D1-dev
2024-06-06 04:18:28 +00:00
Pawan Wagh
9021526247
Fix test config
...
test app was failing to install when running in integration due to
shared uid. Removing the sharedUid field from test.
Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: I37f481c552f8f0779bcd8c69cf4e40598590f5db
2024-06-05 23:02:50 +00:00
Xin Li
3c3a1cc6c6
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: Id3d79805bb2289b84ad34ac05a97e50f0410502f
Change-Id: I70f531e800ed5f3765a100b5b5cecb99664c1dbc
2024-06-05 14:12:13 -07:00
Chaohui Wang
2a73671d62
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours am: 1720630e6e
-s ours am: acb62012e4
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I2b2519556777db0cf8c8639f8526161df66ba562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:17:09 +00:00
Chaohui Wang
2788337410
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
am: 52f79ff225
am: d7d1839227
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I59c34274ae583e6a384ce2efb0931016b64226cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:16:55 +00:00
Chaohui Wang
acb62012e4
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours am: 1720630e6e
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Iad192c356baaf0b041cbda0114d75e6e8e749443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:01:25 +00:00
Chaohui Wang
ba2a4fc028
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours am: fb7538a911
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I25abd64d70424e72fdf6095193d49982f80d3377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:01:12 +00:00
Chaohui Wang
d7d1839227
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
am: 52f79ff225
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I17adb5badb8ea92de3f9b98ec5a909f50648ce39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:01:12 +00:00
Chaohui Wang
c3226a893f
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
am: 8901efd7e5
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 855053ca41
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I0f4eef679820915d047b026de08ab1e6a86fd1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 19:00:48 +00:00
Chaohui Wang
1720630e6e
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I8d8966af423daca4a639f188fcf457cd88cae486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:46:36 +00:00
Chaohui Wang
fb7538a911
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours am: 178f7a0806
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I72b47aa24486bce5d8fb144c39b76fe17d1d19f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:41:12 +00:00
Chaohui Wang
8901efd7e5
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Iae1647ee825d50fd4a1caec326af0dda95e34e0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:40:59 +00:00
Chaohui Wang
178f7a0806
[automerger skipped] Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
am: a61b3964c2
-s ours
...
am skip reason: Merged-In I303b8c6e0f3c3a1174a047ba98f302042e5db9ae with SHA-1 092668676a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I573404e110ca4979a2ef11963529dbefaaf92747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:40:50 +00:00
Chaohui Wang
52f79ff225
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
am: bc56517fe9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Ic4efeb96e0aa9eabbd77b58d344eba517eeee768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:40:37 +00:00
Chaohui Wang
bc56517fe9
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 9dfeabd51b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: Ife3fc06e681f0ba7e5e167630e8b25e70b2c760a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:16:10 +00:00
Chaohui Wang
a61b3964c2
Limit wifi item edit content's max length to 500 am: 092668676a
am: 0a57f0589f
am: d80e331ede
am: 2f6a54d7de
am: 5d7cc10daa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I005572a454c3c809b7658aa7a20f3d7255316051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 18:15:41 +00:00