Michael Bestas
3a00671373
Settings: Hide "Mainline module version" preference
...
* Remove misleading titled preference (Google Play system update)
* This is always set to current android version for AOSP
Change-Id: Ie9799e87de2f3a3421ff501ed8937f5f684458ee
2025-06-22 12:59:29 +03:00
Luca Stefani
581089a2ef
Add toggle to enable ADB root
...
Co-authored-by: Bruno Martins <bgcngm@gmail.com >
Co-authored-by: dianlujitao <dianlujitao@lineageos.org >
Co-authored-by: Luca Stefani <luca.stefani.ge1@gmail.com >
Co-authored-by: LuK1337 <priv.luk@gmail.com >
Change-Id: Ic80dbf79265c0fe7113f42299479873befb05004
2025-06-22 12:59:29 +03:00
Bruno Martins
e1b61b66ce
BasebandVersionPreferenceController: Trim baseband if needed
...
Some Qualcomm MSIM devices report the baseband version twice.
Handle it gracefully, similarly to CAF.
Change-Id: I93bd071f31fed120c20185c4e0ec40edb7ca342b
2025-06-22 12:59:29 +03:00
Steve Kondik
0e30559b26
Settings: Add rotation settings
...
* Links to LineageParts
Change-Id: I896c53089fca0ee3b0e867144bb1d72fe8946eaf
2025-06-22 12:59:29 +03:00
LuK1337
5f81556f83
Settings: Depend on LineagePreferenceLib
...
Change-Id: I553ae8e2a3eaaf7f13551180c97cd369f67ad14d
2025-06-22 12:59:29 +03:00
LuK1337
638fab6e55
Settings: Add LineageOS entries into device info
...
Co-authored-by: Harry Youd <harry@harryyoud.co.uk >
Co-authored-by: Kevin F. Haggerty <haggertk@lineageos.org >
Co-authored-by: Timi <timi.rautamaki@gmail.com >
Co-authored-by: Tobias Tefke <tobias.tefke@tutanota.com >
Change-Id: I8d4c6869f8dfa34a96567bec18f9f8276b66a64e
2025-06-22 12:59:29 +03:00
Sam Mortimer
5d92270e99
Settings: Depend on lineage platform library
...
Change-Id: I9f23ed70ba4eba9a0008c33ecc4b048c23ca9be3
2025-06-22 12:59:28 +03:00
LuK1337
159eee0278
Settings: Put device info header above "Basic info"
...
Change-Id: I8db12e882c16d6afa0e04bc1c4e93f7ec99960ed
2025-06-22 12:59:04 +03:00
Torsten Grote
c18a1ef322
Allow the user to change the BackupTransport
...
Set the following config overlays to activate this feature:
* config_backup_settings_intent to settings://com.android.settings.backup.transport
* config_backup_settings_label to some user-facing label
e.g. Change backup provider
* config_ignored_backup_transports to hide transports from the list
Co-authored-by: Michael Bestas <mkbestas@lineageos.org >
Co-authored-by: Michael W <baddaemon87@gmail.com >
Change-Id: I080d96e2c34045a0e61f3fa1b839f463550f2028
2025-06-22 12:59:04 +03:00
Asher Simonds
4db73d66ce
Settings: Bring in the new icon
...
* Part of the new iconset made by Asher Simonds
Co-authored-by: Michael W <baddaemon87@gmail.com >
Change-Id: Icdc71193c78642c9253f34b04f8629864f48212a
2025-06-22 12:58:16 +03:00
Treehugger Robot
ea8022feeb
Merge "startActivityForResult with earlier new Intent" into security-aosp-25Q2-staging
2025-06-20 11:52:40 -07:00
Treehugger Robot
145b4a0870
Merge "Prevent SettingsSliceProvider from accessing unused packages" into security-aosp-25Q2-staging
2025-06-19 10:17:12 -07:00
Joe Bolinger
0baf462586
Ignore face settings extras when called by an external package.
...
Bug: 411418366
Flag: EXEMPT bug fix
Test: manual from any user not 0 (adb shell am start -a android.settings.FACE_SETTINGS --ei android.intent.extra.USER_ID 0)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:486947205e05e83314bd76e4822af442ca82be9c )
Merged-In: I06193e421a140a90568251fc25baa7fc81c12d78
Change-Id: I06193e421a140a90568251fc25baa7fc81c12d78
2025-06-12 17:00:28 -07:00
Julia Reynolds
afcd445ef3
Merge "Hide notification content in history" into security-aosp-25Q2-staging
2025-06-10 12:07:15 -07:00
Adam Bookatz
d8166274a0
startActivityForResult with earlier new Intent
...
We already make sure to use a copy of the Intent, but now we do so
earlier. See bug.
Bug: 353680402
Flag: EXEMPT bugfix
Test: manual
Test: atest com.android.settings.users.UserSettingsTest
com.android.settings.users.UserDetailsSettingsTest
Change-Id: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
Merged-In: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
(cherry picked from commit b7240e2f0c50455a1c8f3ae1fc4f27d55b86e89b)
2025-06-05 15:25:05 -07:00
Rubin Xu
48e4b5e1af
Use correct API to get calling package name in CredentialStorage
...
Activity.getCallingPackage() does not always return the package
name of the actual calling app. getLaunchedFromPackage() should
be used instead.
Bug: 389681530
Test: manual
Flag: EXEMPT bugfix
Merged-In: Ibdbc45e53f4aa46fae79fa234705b3735bfda4cd
Change-Id: Ibdbc45e53f4aa46fae79fa234705b3735bfda4cd
(cherry picked from commit 70bd3efe0674bccb0d454845d86fb2402779a7bf)
2025-06-05 04:03:10 -07:00
Mill Chen
fc32bd01fa
Prevent SettingsSliceProvider from accessing unused packages
...
DISABLE_TOPIC_PROTECTOR
Bug: 388034510
Test: adb shell cmd slice get-permissions com.android.settings.slices
atest SettingsSliceProviderTest
Flag: EXEMPT security issue
Change-Id: Ia655fbb9cb46f192559b82f957e3b2f0dd86946c
Merged-In: Ia655fbb9cb46f192559b82f957e3b2f0dd86946c
2025-06-03 00:02:02 -07:00
Julia Reynolds
ac4d72060a
Hide notification content in history
...
- if the user is locked
- and the user has chosen to hide sensistive content when locked
Test: manual with a work profile with a different pin
Bug: 378088320
Flag: EXEMPT bug fix
Change-Id: Ia70454d9859fb788ffa1f48f88760f88c354cdff
(cherry picked from commit 9df37c3f8be2dedd2e44e52da4de45fba33c6a6e)
2025-05-27 09:21:35 -07:00
Treehugger Robot
4f4deeaf16
Merge "Drop PendingIntent extras from external packages during enrollment." into security-aosp-25Q2-staging
2025-05-21 19:33:39 -07:00
Adam Bookatz
094c9df207
Do not enable the Content Protection toggle for non-admin users.
...
Flag: EXEMPT bugfix
Bug: 409318132
Test: m -j256 Settings && atest
SettingsRoboTests:ContentProtectionTogglePreferenceControllerTest
Change-Id: I46609c795923d427a5b7fa10bc2e8b071fad72d6
(cherry picked from commit ef801e1a8ec3a18ce9e0221fc7e1dfe495d0be8a)
2025-05-20 09:35:32 -07:00
Justin Dunlap
a91dd2fb5b
Merge "Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings." into security-aosp-25Q2-staging
2025-05-20 07:55:24 -07:00
Aseem Kumar
ade7c77634
Add ComponentName explicitly to make sure arbitary intents aren't launched from Settings.
...
Bug: 378902342
Flag: EXEMPT security fix
Change-Id: I0e67f1258cb427c5b998e40a8a0c104af3ead042
(cherry picked from commit 6a896b6b26d445800773e1b4649895bea17eac1f)
2025-05-19 08:56:51 -07:00
Adam Bookatz
586422578d
AppRestrictions - use vetted component
...
After vetting the intent, use the component we used for the vetting.
Bug: 353680402
Bug: 365739560
Test: manual
Flag: EXEMPT bugfix
Change-Id: Iff0d820c1261c29eb6703bf89194339cba700688
(cherry picked from commit d3e34060803c97ae05719fe9301026e5c54892c8)
2025-05-19 08:53:24 -07:00
Joe Bolinger
9dd5ed1cea
Drop PendingIntent extras from external packages during enrollment.
...
Bug: 388528350
Flag: EXEMPT bugfix
Test: atest FingerprintEnrollIntroductionTest FaceEnrollIntroductionTest
Change-Id: I61281dcf95e53100a96d6a218f3f00fd1b4ea3f9
(cherry picked from commit 4ccdeee849d5fef78498ba33cadc525523efcbd7)
2025-05-16 18:04:18 -07:00
Android Build Coastguard Worker
cf4c8c7049
Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010532'] into 25Q2-release.
...
Change-Id: I17b7fe4e4196befdd6df7ef7de0a774032f04602
2025-05-16 09:18:57 -07:00
Jay Wang
9fca47cbc1
Add battery health tip
...
Bug: 406894719
Test: local test
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b49d170117c6918efe56a883add4816c279fd2a9 )
Merged-In: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
Change-Id: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
2025-05-16 09:17:07 -07:00
Android Build Coastguard Worker
0fb38ed81e
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32799199'] into 25Q2-release.
...
Change-Id: I53c81f56907c0b68bdb4376b1cede8abc75ebadc
2025-04-25 14:23:28 -07:00
Vadym Omelnytskyi
a2d3155609
Revert "Screen Resolution: add space for 4-digit values"
...
This reverts commit 14050c89f5 .
Reason for revert: b/406416297
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:626993cd66a1e2b75cc40445373d22503f73f19e )
Merged-In: Ib683398cf3c3753d2874e4f108c0bb09a9635ab5
Change-Id: Ib683398cf3c3753d2874e4f108c0bb09a9635ab5
2025-04-25 14:06:57 -07:00
Android Build Coastguard Worker
e1c2d09e01
[coastguard skipped] Merge sparse cherrypicks from sparse-13392877-L45400030011494577 into 25Q2-release.
...
COASTGUARD_SKIP: I37f1895c1092f45f91089c36b3b4409dde3e691c
COASTGUARD_SKIP: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
Change-Id: I5a50b50be0a87b01a1d93b40ee1f3d20e80c6a08
2025-04-23 13:45:11 -07:00
Android Build Coastguard Worker
b4a412b3d5
Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010532'] into sparse-13392877-L45400030011494577.
...
SPARSE_CHANGE: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
Change-Id: I37f1895c1092f45f91089c36b3b4409dde3e691c
2025-04-23 13:40:47 -07:00
Jay Wang
024836686b
Add battery health tip
...
Bug: 406894719
Test: local test
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b49d170117c6918efe56a883add4816c279fd2a9 )
Merged-In: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
Change-Id: I15c5cfafa5a78f3b5e767a48f4f23359eb3a68bc
2025-04-23 13:38:11 -07:00
Android Build Coastguard Worker
12ea1a89e5
Merge cherrypicks of ['googleplex-android-review.googlesource.com/33140168'] into 25Q2-release.
...
Change-Id: I667898a56b609288d7778cec0dc8351889e10560
2025-04-21 19:29:02 -07:00
tom hsu
edcb16bde3
Improve potential NPE problem
...
- Move CarrierConfigCache initialization to make sure the instance
created.
Flag: EXEMPT bug fix
Fix: b/409841639
Test: atest pass
(cherry picked from commit 00ab92f97f2c04ca9f604f282542ffd9680f27fc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c2c6745859027b54628bea81a153856e2d8c753 )
Merged-In: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
Change-Id: I07bf9eca1d271d0f38c4d12cd8e04d8a6d4623ed
2025-04-21 19:27:43 -07:00
Android Build Coastguard Worker
08e0488ee2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32950184', 'googleplex-android-review.googlesource.com/32952319', 'googleplex-android-review.googlesource.com/33000561'] into 25Q2-release.
...
Change-Id: I2b7939e1a11a9ba5856365582e6f2826c62bb8b8
2025-04-12 12:47:05 -07:00
Bill Yi
d27d4d0a87
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1fd9d49502f3022819250d4f7b071105a487afb8 )
Merged-In: I8cb5cfdb20be049154127cb51d8f9c2d449efaa1
Change-Id: I8cb5cfdb20be049154127cb51d8f9c2d449efaa1
2025-04-12 12:33:38 -07:00
Bill Yi
d2a3eb3a91
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb6e003c12031ec5a006e9823027127dca586386 )
Merged-In: I9936898bcefdabe144efb3368d7eebe9c7a44f6a
Change-Id: I9936898bcefdabe144efb3368d7eebe9c7a44f6a
2025-04-12 12:33:26 -07:00
Bill Yi
e3192b4216
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 408276020
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bf65f030c604c1e37979de8f5879d59d94c8b35 )
Merged-In: Idb362ec0402a802fffc104243ed0bafe3bd50df7
Change-Id: Idb362ec0402a802fffc104243ed0bafe3bd50df7
2025-04-12 12:33:10 -07:00
Android Build Coastguard Worker
bbb340f8ea
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32887373'] into 25Q2-release.
...
Change-Id: Ia413b76ff8767e69f8a757e39d65c5aeb709b2c7
2025-04-07 20:05:00 -07:00
Florian Mayer
92e1b25a29
Fix crash if device policy disables MTE
...
Flag: EXEMPT bugfix
Test: set device policy using TestDPC, observe crash is gone
Bug: 407990172
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ec6b4842bef8f6f29989bb370d44499a70d6172e )
Merged-In: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
Change-Id: Ib5f01cb5bb3296ee0b5909a1a730e9dad040902b
2025-04-07 20:00:34 -07:00
Android Build Coastguard Worker
294b12a39b
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32835485', 'googleplex-android-review.googlesource.com/32836107', 'googleplex-android-review.googlesource.com/32836113'] into 25Q2-release.
...
Change-Id: I8c3ca8cef3574248052d0cf5a25211a2afc5767b
2025-04-02 19:49:13 -07:00
Bill Yi
8aee29c53e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:439726a415d603de90517871de285661018db5d3 )
Merged-In: I808ce1ffe3b38350d50e049cdfb5bedd2812e1f5
Change-Id: I808ce1ffe3b38350d50e049cdfb5bedd2812e1f5
2025-04-02 19:38:21 -07:00
Bill Yi
07e7d29473
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a273b927dd2b7be164abb1145ca00e8b92bc5e41 )
Merged-In: I8f4075e67060fcb7220d230b9a8e6e5063877edd
Change-Id: I8f4075e67060fcb7220d230b9a8e6e5063877edd
2025-04-02 19:38:04 -07:00
Bill Yi
9165802054
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Bug: 406841318
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce58acd615ac53dc476a87c9e4ed1f9441c2c4aa )
Merged-In: I5fdbe6b236274b7a005f8378a6bedd2f7f750897
Change-Id: I5fdbe6b236274b7a005f8378a6bedd2f7f750897
2025-04-02 19:37:46 -07:00
Android Build Coastguard Worker
2b76145529
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32649929'] into 25Q2-release.
...
Change-Id: I9335e3e4e9d90c255d17b9a8bdd7d46e87189bf8
2025-04-01 20:54:39 -07:00
Steve Statia
1127cfb00f
Fix hidden menu not showing phone information 100% of the time when opening.
...
The function that sends the special code is sending intents to all
users, which is creating an activity for both the work profile and the
system user. Whichever intent is received last will be the activity on
top and displayed to the user, and since the work profile's hidden menu does not include the 'Phone
information' option it creates this 'randomness' observed with opening the menu.
This change ag/29101523 started sending the broadcast as UserHandle.ALL, instead of just from the current user causing the reception of more than one intent.
This fix checks for the work profile and returns out of the function without starting another TestingSettings activity.
Flag: EXEMPT bug fix
Bug: 406016005
Test: manual test opening hidden menu, and opening after reboots
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:170fcaf31628d3faf689ce1b525bfba33052d877 )
Merged-In: I5a7937ba484afd3ba81c55e66bc53c217a778d18
Change-Id: I5a7937ba484afd3ba81c55e66bc53c217a778d18
2025-04-01 20:42:13 -07:00
Android Build Coastguard Worker
c8c292cede
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32650559', 'googleplex-android-review.googlesource.com/32797479'] into 25Q2-release.
...
Change-Id: I675d8e59031d99c15c86135c9ecd8797f66deea9
2025-03-31 20:55:39 -07:00
tom hsu
c8b730509d
[Satellite] Restrict requestIsSupported only in Manual type
...
- SatelliteManager#requestIsSupported only can be used in Manual
conneciton type. Hence add a type check with this API for the
condition check
Flag: EXEMPT bug fix
Fix: b/395811260
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d033f603b819c5b1264d116648c9f6f00b061320 )
Merged-In: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
Change-Id: Ia9fed86a63dd8fa87cc20a83888b3cabbf28ddd8
2025-03-31 20:54:29 -07:00
tom hsu
e9e45b4a01
[Satellite] Refactor API usage to Util class.
...
Flag: EXEMPT refactor
Fix: b/403149290
Test: atest pass
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8916db934fb3d7dc1f94f67c7b409beeff2c6ac6 )
Merged-In: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
Change-Id: I8f6375c59cbb2010ad9232b8abe71af60c6133f9
2025-03-31 20:54:17 -07:00
Android Build Coastguard Worker
94029d5c7c
Snap for 13264465 from 0773c4d93f to 25Q2-release
...
Change-Id: I1ce8a575e4f55decafe0d4417744842b723774b2
2025-03-24 18:42:58 -07:00
Yuri Lin
0773c4d93f
Merge "Merge bundle global & type preference controllers." into main
2025-03-24 12:13:24 -07:00