Commit Graph

143690 Commits

Author SHA1 Message Date
Vilas Bhat
d30433c92e 16KB: Fix failing tests for AOSP targets
UiAutomator is case sensitive. On AOSP builds, the "Erase all data"
string is displayed in all caps in the dialog box on trying to erase all
data and switch to ext4 mode. This is a workaround fix for the issue.

Bug: 390535191
Flag: EXEMPT bugfix
Test: Enable16kbTest on AOSP Pixel 8 targets
Change-Id: I119fe076eb3eb037a23f07af77b9ad4935cb4064
2025-01-22 00:12:56 +00:00
SongFerng Wang
45d7ae68e4 Merge "Encounter unknown error in test" into main 2024-12-29 18:58:12 -08:00
SongFerng Wang
14f0d7e7d0 Encounter unknown error in test
When atest on aosp_cf_x86_64_only_phone-trunk_staging-userdebug,
it said the "java.lang.NoSuchMethodError: No static method getCurrentCarrierNameForDisplay(Landroid/content/Context;)Ljava/lang/CharSequence; in class Lcom/android/settings/network/telephony/MobileNetworkUtils;"

Bug: 370884447
Bug: 370425683
Test: atest MobileNetworkUtilsTest
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd7e4d27aed0b456ab0254ff821ff568fe335f61)
Merged-In: I76bfc4c1cabaf569d74309e9e9ad6612f5649d9b
Change-Id: I76bfc4c1cabaf569d74309e9e9ad6612f5649d9b
2024-12-29 18:44:18 -08:00
Treehugger Robot
c8e78dc149 Merge "Hide Linux terminal if VM isn't supported" into main 2024-12-28 07:11:08 -08:00
Treehugger Robot
9e1b206016 Merge "Show GSM settings with CDMA phone type" into main 2024-12-25 12:38:11 -08:00
Treehugger Robot
d16d627a71 Merge "Reduce the Terminal app storage requirement from 128GB to 64GB." into main 2024-12-23 10:20:45 -08:00
Qiang Chen
7abc384e33 Show GSM settings with CDMA phone type
Phone type may be changed to CDMA if no SIM is in this sub and will not
show GSM settings in current design, so remove sub info check for
showing GSM settings.
Show GSM settings if the current radio can support both 3GPP and 3GPP2
radio technologies at the same time.

Bug: 278178437
Test: Manaul

Change-Id: I4f8cbfcdcff8f74944e2ba9a79b0945be6dd6ebd
2024-12-22 17:46:53 +05:30
Kyle Zhang
3874c11b94 Merge "Fix force L3 preference unit test" into main 2024-12-20 14:18:22 -08:00
Jaewan Kim
614074e5c7 Hide Linux terminal if VM isn't supported
Bug: 385216798
Test: atest
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: I06fe52cf877deb3cd9ebc61af1579931b97d7766
2024-12-21 00:31:55 +09:00
Kyle Zhang
3d84ccf8a2 Fix force L3 preference unit test
Bug: 385101776
Change-Id: I898b7855d3922636c09c99414cdaefee236fc71f
2024-12-19 16:02:45 -08:00
SongFerng Wang
51769c2ed4 Merge "Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE" into main 2024-12-19 02:56:12 -08:00
Treehugger Robot
250101cd8f Merge "Fix the NPE in the tryToFetchUsageData() method" into main 2024-12-18 14:30:37 -08:00
YK Hung
7ea9d15853 Fix the NPE in the tryToFetchUsageData() method
Test: atest
Bug: 371490669
Fix: 371490669
Flag: EXEMPT for simple fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:291e92d6493b9640bc87bc787b58daa0936bae8e)
Merged-In: I4167becf373a6279135261bbaff44ef0888728fa
Change-Id: I4167becf373a6279135261bbaff44ef0888728fa
2024-12-18 13:35:29 -08:00
Henri Chataing
18eac4ef27 Merge "Update the cache of a2dp config before writing config." into main 2024-12-18 08:17:34 -08:00
Wei-Hong Hsu
5565b51402 Merge "nfc: allow the nfc quick toggle title to be searchable" into main 2024-12-16 18:24:24 -08:00
Wei-Hong Hsu
250f5cade5 nfc: allow the nfc quick toggle title to be searchable
allow the nfc quick toggle title to be searchable

Bug: 374853887
Test: search NFC in the settings search.
Change-Id: I1115b1705b91eb9f40acbef83ed92b9aee11dd3d
2024-12-16 05:52:31 +00:00
Xin Li
b1c96fcf83 Merge "Merge 24Q4 into AOSP main" into main 2024-12-13 17:00:46 -08:00
Xin Li
413f38d475 Merge 24Q4 into AOSP main
Bug: 370570306
Merged-In: I2c1246a4b34c6b09a42c05153c0e3f015d475df1
Change-Id: Ia12a9e27e05358f61b70868a68300a08cf074253
2024-12-13 11:15:21 -08:00
Treehugger Robot
7307f34866 Merge "Update the OWNERs" into main am: 5655b46dee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3412198

Change-Id: I508a2b6d6aab099c9cc95a06c89c01545df6e197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-12 23:38:24 -08:00
Treehugger Robot
5655b46dee Merge "Update the OWNERs" into main 2024-12-12 22:45:50 -08:00
Tom Hsu
c3b8b7a21d Update the OWNERs
Change-Id: Iee6e33e04d232b78bf2d2064687a2d434b4f78c0
Flag: EXEMPT only changing OWNERS
Fix: b/383913940 
Test: make pass
2024-12-12 22:33:46 -08:00
Treehugger Robot
e9ced5b8c7 Merge "Partial revert to restore lottie_bubbles.json" into main am: 7067c6781f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3362646

Change-Id: I7e610f36ac0d009174adf37bfeb2f434939348f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-12 09:43:28 -08:00
Treehugger Robot
7067c6781f Merge "Partial revert to restore lottie_bubbles.json" into main 2024-12-12 09:16:52 -08:00
Qiang Chen
f00508c4b5 Add nonNull check for SubscriptionInfoEntity to avoid Settings NPE
This NPE can be found in MTBF stress testing

Bug: 290855314
Test: Manaul

Change-Id: I03aaa6618255638a485f32e1bab34c6fa71945e4
2024-12-11 13:24:33 +05:30
Treehugger Robot
0b36bd05ec Merge "Settings: Fix face enroll stack overflow" into main am: e0e07dab27
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3389339

Change-Id: I83098683c5e25576db53963e032253cc5eb5780b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-11 03:48:37 +00:00
Treehugger Robot
e0e07dab27 Merge "Settings: Fix face enroll stack overflow" into main 2024-12-11 03:22:16 +00:00
Saswat Padhi
0937b6de17 Reduce the Terminal app storage requirement from 128GB to 64GB.
Bug: 366374130

Change-Id: If22d5388a6e58076626c1019f7f909398c61ccfd
2024-12-11 00:55:46 +00:00
Treehugger Robot
ca445ed06d Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca93976a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238

Change-Id: I8c3f7ba8b5a1e237148a6532d53d2b519ef1862f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-09 04:18:48 +00:00
Treehugger Robot
cdca93976a Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main 2024-12-09 03:48:13 +00:00
Treehugger Robot
0decf6e746 Merge "Update OWNERS for Android Settings" into main am: 01af7b14de
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3381149

Change-Id: I6ad17f8ae918a5e16ee3e7107aceb203640d9cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-05 03:21:36 +00:00
Treehugger Robot
01af7b14de Merge "Update OWNERS for Android Settings" into main 2024-12-05 02:41:39 +00:00
Treehugger Robot
b6683ea552 Merge "Customize the availability of Testing Settings Menu" into main am: d25fdc50d8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2927822

Change-Id: I3d6a579d6a5b999b783610e1a2b80031aa1b1ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 11:51:51 +00:00
Treehugger Robot
d25fdc50d8 Merge "Customize the availability of Testing Settings Menu" into main 2024-12-04 11:24:50 +00:00
David Magno
8839335d58 Customize the availability of Testing Settings Menu
Add the possibility to disable the Testing Settings Menu
(secret code *#*#4636#*#*) on user builds.

Bug: 306338055
Test: atest TestingSettingsBroadcastReceiverTest
Flag: NA
No-Typo-Check: trivial
Change-Id: I451f094864bd9a0ad8086e9646e2d666ab2388dc
2024-12-04 11:23:25 +00:00
Xin Li
fe5a8d38f3 Merge "Merge ab/AP4A.241205.013 into aosp-main-future" into aosp-main-future 2024-12-03 16:50:21 +00:00
hoffc
e2c1316682 Settings: Fix face enroll stack overflow
Stack overflow occurs when enrolling face.

Buganizer: 381974811
Change-Id: I9c5ae8f07f5ce9174b270abfef313bcf12fd2c57
2024-12-03 15:33:41 +08:00
Edward Savage-Jones
844dd0e097 Partial revert to restore lottie_bubbles.json
The tablet version of this animation exists in AOSP, under:

 ./raw-sw600dp/lottie_bubbles.json

this CL restores the phone version that was accidentally (?)
removed in an earlier commit (73a61a8).  Restored using:

 git checkout 73a61a8 res/raw/lottie_bubbles.json

Bug: 379667765
Test: robotest and see the UI
Change-Id: Ibf404c9402a808f09ac751b5f34c029a570eb3f4
2024-12-02 10:54:27 +01:00
Jason Chiu
a25868453c Update OWNERS for Android Settings
Fix: 381373363
Test: N/A
Change-Id: I97f7667dd104b9d8b0f6db72f05444e77458975a
2024-11-28 09:15:16 +00:00
Treehugger Robot
deec945b4d Merge "Revert "Turn off voice access in 16KB mode"" into main am: 262b9d9b41
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3320718

Change-Id: I806211fb1462e737206e0f2aef762809eaf907f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-28 02:17:10 +00:00
Treehugger Robot
262b9d9b41 Merge "Revert "Turn off voice access in 16KB mode"" into main 2024-11-28 01:35:31 +00:00
Pawan Wagh
5da1293494 Revert "Turn off voice access in 16KB mode"
This reverts commit 6de4093876.

Test: m Settigns
Bug: 335443194
Bug: 340231742
Change-Id: I6b3ab5ba9626dd17c1e6383d8b390fb7c91c9efc
Merged-In: Id2c4584835766e9620234233b6594c0dd59b68e9
2024-11-27 22:32:48 +00:00
Xin Li
b6cfdb21a8 Merge ab/AP4A.241205.013 into aosp-main-future
Bug: 370570306
Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b
Change-Id: Ia46be767cd3e134c3f1b37411a72c4e0be28ecee
2024-11-27 12:53:11 -08:00
Treehugger Robot
ed4e2b8fc0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 7fb8f02f4e -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198

Change-Id: I5595a4c81cb5fe774cf988e3f93a314f9dcfac7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 10:56:49 +00:00
Bill Yi
509dca3230 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf48d5b7e5 -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198

Change-Id: I0b7996dbdc864d14de0394caeb2db72db91f5ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 10:56:44 +00:00
Treehugger Robot
df0f56a8ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 6ab2e734bd -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197

Change-Id: I7b613e588c8f201b477b9f432ffecd45a0803cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 10:56:40 +00:00
Bill Yi
707f62a539 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5892f6b9cf -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378197

Change-Id: Ie7782d76d64a5328885623a27758673efaebe683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 10:56:37 +00:00
Treehugger Robot
8c5e7cf31b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 9bb494666f -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798

Change-Id: I0addb62b8b0203f7dd9a15fc45ef5d7c37435d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 10:56:31 +00:00
Bill Yi
1e3c0162cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f76efce0bf -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3377798

Change-Id: Id56e72a5be3a8140c3a333acf3af83175b690349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-27 10:56:09 +00:00
Treehugger Robot
7fb8f02f4e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-11-26 22:41:29 +00:00
Treehugger Robot
6ab2e734bd Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-11-26 22:41:29 +00:00