Commit Graph

145374 Commits

Author SHA1 Message Date
Treehugger Robot
7b2b283d00 Merge "Explicitly keep default constructor in rules without members" into main am: cfc4d29e89
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3438521

Change-Id: Ifbe6a637d95fda5346b93c8c86f175b9463ecde2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-29 22:42:06 -08:00
Treehugger Robot
cfc4d29e89 Merge "Explicitly keep default constructor in rules without members" into main 2025-01-29 22:17:01 -08:00
Owner Cleanup Bot
3aee441d2c [owners] Remove aroederer@google.com from src/com/android/settings/notification/OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote the lowest CR value
(i.e. reject the CL) and the bot will abandon it. Vote the highest CR to
approve this change. You may also abandon this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/aroederer@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Ifa12fa8e045776b6351530a5f1341311046e9a1c
2025-01-26 08:24:44 -08:00
Pawan Wagh
8102d256b4 Merge "Updating the notification ID " into main am: 9d451341a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3453239

Change-Id: Ia18d8a66806956ca6260672b77c56cb0900d7279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-24 15:28:38 -08:00
Pawan Wagh
9d451341a0 Merge "Updating the notification ID " into main 2025-01-24 15:21:49 -08:00
Justin Yun
badb14fdb1 Merge "Revert "Replace system_ext container with system"" into main am: faa8f0e399
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3463347

Change-Id: I319bce0a062165a630c5ed391ad9305eaac511e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-24 02:05:44 -08:00
Justin Yun
faa8f0e399 Merge "Revert "Replace system_ext container with system"" into main 2025-01-24 01:49:56 -08:00
Alex Stetson
99f01f7e7a Allow system services to be optional
Some Android systems may not have certain system services (particularly the VirtualMachineManager). If this is the case, disable the preference rather than requiring the service and crashing the Settings app.

Bug: 388221800
Test: manual
Flag: NONE bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5a594828d7e148ac98b077591e8050e424b54966)
Merged-In: I761054caebe3e846f5c6c76e2818662aad2cb511
Change-Id: I761054caebe3e846f5c6c76e2818662aad2cb511
2025-01-24 00:22:14 -08:00
Justin Yun
e0c046c187 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-01-24 15:53:28 +09:00
Android Build Coastguard Worker
94cd5e3096 Merge cherrypicks of ['googleplex-android-review.googlesource.com/31391282', 'googleplex-android-review.googlesource.com/31391537', 'googleplex-android-review.googlesource.com/31391773'] into 25Q1-release.
Change-Id: Id2c5a47139617322cddae51c89cd6eb970c5f52d
2025-01-22 15:42:39 -08:00
Bill Yi
e33852e061 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 391337100
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cd880c770bcbc9f5ea7d9ea4246ca4d73eab0479)
Merged-In: Ica0a861979113dd71d391904ba3e263deee3ccfe
Change-Id: Ica0a861979113dd71d391904ba3e263deee3ccfe
2025-01-22 15:29:36 -08:00
Bill Yi
76a78ab7fa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 391337100
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7f66f41650fd784da39c546685b9b7d5e1fe6849)
Merged-In: If17d45a969aa255408f4fe77918658074ddd692f
Change-Id: If17d45a969aa255408f4fe77918658074ddd692f
2025-01-22 15:29:24 -08:00
Bill Yi
e8df6b2add Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import

Bug: 391337100
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:17a98fe878201c3719f66c4db4a19c8fb9d00ec1)
Merged-In: Ib2ec94d152ba5e4ff16384551617629cd9a6ab2d
Change-Id: Ib2ec94d152ba5e4ff16384551617629cd9a6ab2d
2025-01-22 15:29:09 -08:00
Vilas Bhat
78c5a735ad Merge "16KB: Fix failing tests for AOSP targets" into main am: 62c017beb5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3455768

Change-Id: If65e7e554d6b2850436b09de06bb96ac3669fbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-22 14:21:32 -08:00
Vilas Bhat
62c017beb5 Merge "16KB: Fix failing tests for AOSP targets" into main 2025-01-22 13:55:06 -08:00
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
Pawan Wagh
65263376f7 Updating the notification ID
PageAgnosticNotificationService - updating notification id to avoid the notification being dismissed accidentally by other notifications. ID used is the bug id where this was reported.

Change-Id: I267eed1d14158f06ea688a48c65be209993b869d
Test: atest Enable16KbTest
Bug: 388678898
2025-01-17 11:24:39 -08:00
Jakub Rotkiewicz (xWF)
06695ec0c3 Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main am: bc86ae0553
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451858

Change-Id: I84b5d62aeab19b77148d5febf7a1cdc0a764d572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-15 01:57:08 -08:00
Jakub Rotkiewicz (xWF)
bc86ae0553 Merge "24Q4: Removal of a2dp_offload_codec_extensibility_settings" into main 2025-01-15 01:17:48 -08:00
Jakub Rotkiewicz (xWF)
096a2fb990 Merge "developer settings: remove unused a2dp Preference" into main am: b896665a32
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3451857

Change-Id: I2ebc9eb5d0b571be8838e0a2a77d7ed53f7ea7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-15 01:08:40 -08:00
Jakub Rotkiewicz (xWF)
b896665a32 Merge "developer settings: remove unused a2dp Preference" into main 2025-01-15 00:43:50 -08:00
Jakub Rotkiewicz
1dda4f5526 24Q4: Removal of a2dp_offload_codec_extensibility_settings
Bug: 323319530
Fix: 323319530
Flag: EXEMPT removing com.android.settings.development.a2dp_offload_codec_extensibility_settings
Test: atest SettingsRoboTests
Merged-In: If9c710c0aaed7326b32dd2e7d5f3109de4047b97
Change-Id: I3fad2d0b5b356afd3524ef9ddc0cf1ccbaed9eb4
2025-01-15 07:52:37 +00:00
Jakub Rotkiewicz
672fcd51ab developer settings: remove unused a2dp Preference
Bug: 329809288
Flag: EXEMPT - unused code
Test: m -j
Merged-In: Ibd526fffddf5ea545afc437a5daee12bb1cf8746
Change-Id: Ie219247e1fd0fd92407c04d5d775a685a13467c4
2025-01-15 07:49:22 +00:00
Treehugger Robot
2da834d44e Merge "Align ownership between Connectivity and settings" into main am: 2826098a66
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3446592

Change-Id: Iaff7452eb851c28c97e9b4715383a7050085e1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-10 16:14:23 -08:00
Treehugger Robot
2826098a66 Merge "Align ownership between Connectivity and settings" into main 2025-01-10 15:54:50 -08:00
Maciej Żenczykowski
551fa0d4d6 Align ownership between Connectivity and settings
(using core_networking_xts, not core_networking because it's a better match for the allowed set of folks)

Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie8192fd06b0d5507884e083eaf6d6614c40ff2ea
2025-01-10 11:57:55 -08:00
Android Build Coastguard Worker
48660719bc Merge cherrypicks of ['googleplex-android-review.googlesource.com/31216799'] into 25Q1-release.
Change-Id: Ibc22d2bde93ba0a6c2cb92da3b175e90e9bd3ab4
2025-01-10 10:39:58 -08:00
Matías Hernández
f496cf6fb9 Fix NPE on modes page when schedule has no days
Fixes: 387088843
Test: atest ZenModeTriggerUpdatePreferenceControllerTest
Flag: EXEMPT trivial bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5098df9b6c2a7caff5dde39911c70e35f2aacbe7)
Merged-In: I3b845784f5923521d7f3f6cae9d6d27a21f55361
Change-Id: I3b845784f5923521d7f3f6cae9d6d27a21f55361
2025-01-10 10:37:55 -08:00
Treehugger Robot
e96beeeb46 Merge "Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix." into main am: 7aa0ef4049
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3443580

Change-Id: Ia834fda59f1beba933dc92abffcdf4d680863f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-09 10:07:35 -08:00
Treehugger Robot
7aa0ef4049 Merge "Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix." into main 2025-01-09 09:42:36 -08:00
Joy Babafemi
70d953b3da Merge "Update owners for account settings" into main am: aaa8896873
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3441082

Change-Id: I59388fb599bf2f91dcdcafc828476274c37a1683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 20:06:39 -08:00
Joy Babafemi
aaa8896873 Merge "Update owners for account settings" into main 2025-01-08 19:35:45 -08:00
Joy Babafemi
9c13abdc68 Update owners for account settings
Change-Id: I2fe4cf47509aa806e1dfbbd23cea690805c980fa
2025-01-08 14:50:11 -08:00
Rex Hoffman
3d508d0d12 Removing upstream flag as it is now the default.
Also moving to internal robolectric projects to no longer use the  _upstream suffix.

Test: CI
Bug: 386652866
Change-Id: Ic4376619f01834a97ec10c33c283fd7cab45900f
2025-01-08 21:05:34 +00:00
Rex Hoffman
9b18787489 Merge "Removing Dead Flag Test: CI Bug: 386652866" into main am: ccf197b366
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434134

Change-Id: Ic4e6ff898dd4811bb41dd0b71a7d78b9b50fe1ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 12:31:12 -08:00
Rex Hoffman
ccf197b366 Merge "Removing Dead Flag Test: CI Bug: 386652866" into main 2025-01-08 12:17:27 -08:00
Treehugger Robot
066efe6c55 Merge "Fix sim status details not updated after sim hotswap" into main am: e9bc1949a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3431560

Change-Id: I7cdc3dfb7051d2c5fdae20deb8617c09620284cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-08 03:44:52 -08:00
Treehugger Robot
e9bc1949a9 Merge "Fix sim status details not updated after sim hotswap" into main 2025-01-08 03:15:55 -08:00
Christoffer Adamsen
bc97628dd5 Explicitly keep default constructor in rules without members
R8 implicitly keeps the default constructor when no member rules are specified. Future versions of R8 will require apps to explicitly keep the default constructors that are required for the build to work.

This conservatively changes all keep rules that currently keep the default constructor to explicitly keep the default constructor.

Future work will attempt to tighten up the rules that do not require the default constructor to be kept.

Bug: 373579455
Test: existing
Change-Id: I58cf6b4286f696ea38290d888f20c8dcf18b9ede
2025-01-08 00:15:31 -08:00
hoffc
39d16d7bfb Fix sim status details not updated after sim hotswap
Telephony callback may be removed in onPause during sim hotswap, but they are not re-registered in onResume for sub info still null.

Listen sub info change and re-register telephony callback when need.

Test: function test pass and SimStatusDialogControllerTest unit test pass.

Change-Id: I17e60c9e3441fc593107048494f830408c37ae61
Bug: 384643359
2025-01-08 11:53:26 +08:00
Android Build Coastguard Worker
954635a223 Merge cherrypicks of ['googleplex-android-review.googlesource.com/31162558'] into 25Q1-release.
Change-Id: I31785a2978327b7f62e58c9e2e4e6ba089cd1fea
2025-01-07 17:34:37 -08:00
tomhsu
10970ad6be NTN connected type is manual, UI status shall be checked by callback.
- Manual type shall check with onCarrierRoamingNtnAvailableServicesChanged
 - Automatic type check shall check with getAttachRestrictionReasonsForCarrier

Flag: EXEMPT bug fix
Fix: b/387523217
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88a0a7610cf1a68a1215a5a89c971c65200d421b)
Merged-In: Id28885a0972a7f7d6c43ae22149b6e3e49d7f374
Change-Id: Id28885a0972a7f7d6c43ae22149b6e3e49d7f374
2025-01-07 17:30:35 -08:00
Rex Hoffman
f4290c1d03 Removing Dead Flag
Test: CI
Bug: 386652866

Change-Id: Ib8a48063738f6362342957b39451a7c352a9a9d5
2025-01-07 14:01:21 -08:00
Treehugger Robot
64eec09358 Merge "[Thread] update the link for "Learn More about Thread"" into main am: b2a5ee5b76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3438420

Change-Id: Ie7c1fe6415a528acff18a1130e0b53b5f337ffb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-01-06 23:12:39 -08:00
Treehugger Robot
b2a5ee5b76 Merge "[Thread] update the link for "Learn More about Thread"" into main 2025-01-06 22:42:26 -08:00
Kangping Dong
cc22175481 [Thread] update the link for "Learn More about Thread"
The latest link to the help center doc is finalized in b/387356147

Bug: 387356147
Change-Id: Ia3caf2dc78b4cd41d9d046cb072268ac63cdd65e
2025-01-07 13:35:44 +08:00
SongFerng Wang
ddd033762b Merge "Encounter unknown error in test" into main am: 45d7ae68e4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3434137

Change-Id: I0850e5911b50a00f0c6e3f52cb09f34912229b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-29 19:25:21 -08: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
bf33cb8c33 Merge "Hide Linux terminal if VM isn't supported" into main am: c8e78dc149
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3428339

Change-Id: Ia01961126082fbbce594715ae90e02181e49183a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-28 07:42:04 -08:00