Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,772 Commits 1 Branch 0 Tags
fcdd8bb6d99dfe4667efdacf7ce5230c3ce14a0d
Commit Graph

143772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
fcdd8bb6d9 Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839abd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908

Change-Id: I765810619bbf6685ec5f08b0fd4a6d6b14c12e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-18 03:09:11 -08:00
SongFerng Wang
4dca839abd Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main 2025-02-18 02:37:57 -08:00
utzcoz
799e0e877a test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest 
Rule should be public for junit.

Test: atest SettingsRoboTests:com.android.settings.applications.AppWithAdminGrantedPermissionsCounterTest

Merged-In: Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88

Change-Id: I2f577f71011e1197703e115b704af0aa1ee1e5dd
Signed-off-by: utzcoz <utzcoz@gmail.com>
 2025-02-18 00:51:24 -08:00
Treehugger Robot
962cd2e8d8 Merge "Disable Reset app preference during the call." into main am: f7631498f1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498088

Change-Id: I26d7efefb17009300631096118978ec872ea8fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-16 20:15:38 -08:00
Treehugger Robot
f7631498f1 Merge "Disable Reset app preference during the call." into main 2025-02-16 19:44:22 -08:00
Fan Wu
41bb05c7e9 Disable Reset app preference during the call. 
Bug: 395750645
Test: manual
Flag: EXEMPT Bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c6544f991faf8dd1abb0855dd5dcacb08f028e04)
Merged-In: If64b6c878b2f793c6852d000d9d90dda18ef2420
Change-Id: If64b6c878b2f793c6852d000d9d90dda18ef2420
 2025-02-16 19:05:41 -08:00
Pawan Wagh
ca9409db6d Merge "Check if device is online before starting 16kb test" into main am: 7ee0e07a50 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489997

Change-Id: I179833c4f14414ddd823136c061e4c6f21a21aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-14 11:22:23 -08:00
Pawan Wagh
7ee0e07a50 Merge "Check if device is online before starting 16kb test" into main 2025-02-14 10:40:31 -08:00
SongFerng Wang
4fec2b9e47 Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main am: 9dc07f4e19 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3481415

Change-Id: Ic6c9a18dcf9c51be64858caccada960f18f2a58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-12 19:18:18 -08:00
SongFerng Wang
9dc07f4e19 Merge "Fix popping up the the VoLTE screen when it's disabled by the carrier." into main 2025-02-12 18:51:11 -08:00
Pawan Wagh
4a55472cf3 Check if device is online before starting 16kb test 
Test: atest -c Enable16KbTest
Bug: 390535191
Change-Id: I32cc404f8e84fba0e90ecb5b801d98908242292d
 2025-02-11 22:39:38 +00:00
Matías Hernández
228322df95 Merge "Fix OWNERS for Settings > Notification Special Access" into main am: 9598b65442 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489232

Change-Id: I38eed43b6fe5db2296a0f63a9c03bb3ce748619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-11 10:53:45 -08:00
Matías Hernández
17ed485adf Merge "Fix OWNERS for Settings > Modes/DND Special Access" into main am: 27f58a9de4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3489233

Change-Id: Ia8695faf3777e167ef33f6feaec6abf80a9c0b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-11 10:52:31 -08:00
Matías Hernández
9598b65442 Merge "Fix OWNERS for Settings > Notification Special Access" into main 2025-02-11 10:03:39 -08:00
Matías Hernández
27f58a9de4 Merge "Fix OWNERS for Settings > Modes/DND Special Access" into main 2025-02-11 10:03:34 -08:00
Matías Hernández
4d53572381 Fix OWNERS for Settings > Modes/DND Special Access 
Change-Id: I89ff7a3d59b31a19818c0892f025a14f68e7dda9
 2025-02-11 09:20:38 -08:00
Matías Hernández
3c01a5cf05 Fix OWNERS for Settings > Notification Special Access 
Change-Id: I2b2009f418810039874b33c32ebe4f5218fb78a1
 2025-02-11 09:20:09 -08:00
pengfeix
4fa2836aa5 Fix popping up the the VoLTE screen when it's disabled by the carrier. 
- If only has the default carrier config just return, to
  avoid popping up the the VoLTE screen when it's disabled
  by the carrier.

Bug: 332647055
Test: manual
Flag: NONE bugfix
Change-Id: I71bc02f5044535d48726a531e36d57df73bc0f5f
 2025-02-10 08:23:23 +05:30
Ronald Braunstein
97fef8e771 Merge "Remove palanki@google.com from src/com/android/settings/location/OWNERS" into main am: f888596ac5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2854008

Change-Id: I0a675300c7170a91a539d367dff9b5f7b4b071d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-07 15:38:39 -08:00
Ronald Braunstein
cfb5778952 Merge "Remove jaggies@google.com from src/com/android/settings/biometrics/OWNERS" into main am: da41204d7e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2957652

Change-Id: I6712313387b969490fa09a38057fa27363a847d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-07 15:37:07 -08:00
Ronald Braunstein
f888596ac5 Merge "Remove palanki@google.com from src/com/android/settings/location/OWNERS" into main 2025-02-07 15:14:55 -08:00
Ronald Braunstein
da41204d7e Merge "Remove jaggies@google.com from src/com/android/settings/biometrics/OWNERS" into main 2025-02-07 15:12:07 -08:00
Kevin Liu
0db2f6c60f Merge "Temp disable test that contains custom shadow within it" into main am: d1b8b3a7e1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3479734

Change-Id: Ia857f69d48d14a8f30d4e43c1fee7cbf273d019d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-06 11:30:23 -08:00
Kevin Liu
d1b8b3a7e1 Merge "Temp disable test that contains custom shadow within it" into main 2025-02-06 11:11:35 -08:00
Kevin Liu
a9e22be8a5 Temp disable test that contains custom shadow within it 
We need proper support or Exception throw for this scenario

Test: atest SettingsRoboTests
Bug: 394813533
Change-Id: I8b552f7b2bff166643bdaa492dceff23679116ff
 2025-02-06 14:48:43 +00:00
Treehugger Robot
17d0097a46 Merge "Fix crash due to over limited length." into main am: 646fa2d5fa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3478846

Change-Id: I25eafcb494be249eafda49e64e682dc3fbe77866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-06 00:56:44 -08:00
Treehugger Robot
646fa2d5fa Merge "Fix crash due to over limited length." into main 2025-02-06 00:31:51 -08:00
tom hsu
d9b78ebc97 Fix crash due to over limited length. 
Flag: EXEMPT bug fix
Fix: b/388404115
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a66f9dc3629586c3543952566f05f1b720dfa50c)
Merged-In: I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf
Change-Id: I5c72c3c9ca9cb2e4058959abc5a0b4fdd60907bf
 2025-02-05 23:55:33 -08:00
Ronald Braunstein
f4b70bd0a1 Merge "[owners] Remove aroederer@google.com from src/com/android/settings/notification/OWNERS" into main am: 85107f0fb4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3465863

Change-Id: I0b8ffa269b54a4615ca2586659466f10403be651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-02-05 21:02:24 -08:00
Ronald Braunstein
85107f0fb4 Merge "[owners] Remove aroederer@google.com from src/com/android/settings/notification/OWNERS" into main 2025-02-05 20:36:32 -08:00
Treehugger Robot
184aee6710 Merge "Allow system services to be optional" into main am: 55b0bcd8cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3462915

Change-Id: I65cc32fb79196054fb4115722b04771425368d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-31 10:46:07 -08:00
Treehugger Robot
55b0bcd8cb Merge "Allow system services to be optional" into main 2025-01-31 10:04:14 -08:00
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
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