Chaohui Wang
b6799b65c7
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd am: dc70876ddb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Id0eb4d409cb9a434e608cc255056de08e9428050
2022-03-10 08:22:21 +00:00
Chaohui Wang
dc70876ddb
Merge "Clean up unused profile_select_tablayout." am: aee21e8cbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2019419
Change-Id: Ibb221e416ecc360fb3460ef00defbf35e8abf567
2022-03-10 07:59:55 +00:00
Chaohui Wang
aee21e8cbd
Merge "Clean up unused profile_select_tablayout."
2022-03-10 07:30:04 +00:00
Chaohui Wang
34261e25a7
Clean up unused profile_select_tablayout.
...
Change-Id: If1f58f13a8cf14bf078bce16c23fed6726ff223a
2022-03-10 04:57:00 +00:00
Chaohui Wang
0f1547cb76
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: I115858d668df4fe332b15081b1b68ed4768ad938
2022-03-10 04:18:12 +00:00
Chaohui Wang
7e7924bf35
Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296
Change-Id: I0dfa53afd25bcd94624f6f79477a4c8b7a1921d2
2022-03-10 03:39:17 +00:00
Chaohui Wang
0ba498b226
Merge "Fix App Compatibility Settings' lifecycle"
2022-03-10 03:20:25 +00:00
TreeHugger Robot
37279f38c0
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 734d949527 -s ours am: 5db7b3b25f -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: Ia65da02df7a81c29d900121fc1df02bb71fc16e4
2022-03-09 18:31:45 +00:00
TreeHugger Robot
f56cc90557
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf am: 409ac95f00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I2d17216bfbef1df5a06127d4c48f3f2d4e2bdfb0
2022-03-09 18:31:37 +00:00
TreeHugger Robot
5db7b3b25f
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 734d949527 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I94279c39c14d4a69700b67ed679d38cf6b622a9e
2022-03-09 18:12:37 +00:00
TreeHugger Robot
409ac95f00
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I411e57fb64404c5d0bab966c6d92a62a3d5c5394
2022-03-09 18:12:28 +00:00
TreeHugger Robot
734d949527
[automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours
...
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Change-Id: I35974d0cea6185fac6225093e59b8d0bc65516c0
2022-03-09 18:11:59 +00:00
TreeHugger Robot
f48ae98972
Merge "Change default USB configuration to a RestrictedPreference" into sc-dev
2022-03-09 17:54:27 +00:00
TreeHugger Robot
7b40a559bf
Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev
...
* changes:
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
Change default USB configuration to a RestrictedPreference
2022-03-09 17:54:27 +00:00
Etienne Ruffieux
b60c038016
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Idd8a5be969d228f501c245d81bdc09b3496f7f5a
2022-03-09 11:32:11 +00:00
Etienne Ruffieux
1a8bbc4a85
Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316
Change-Id: Ia92b2ac01bf3e9862738d2c40ae53bf97da35759
2022-03-09 11:01:57 +00:00
Etienne Ruffieux
5dd7c32f93
Merge "Replced BluetoothCodecStatus creator by Builder"
2022-03-09 10:24:16 +00:00
lucaslin
51c66e24f3
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57 am: 1264191233
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I2f039885b8cb3823cb7da5031ef7931d587564f1
2022-03-09 09:11:08 +00:00
lucaslin
1264191233
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: Iadd14a41d26647e13d1f751947d91f3f2a360e84
2022-03-09 08:20:16 +00:00
lucaslin
92245b8f57
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I6947b1c6fb64bf4603ee665ebc44d53fb8f8b77d
2022-03-09 07:44:37 +00:00
lucaslin
b38110f853
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I7dfbfc73a887027bb55712e2ea05fd01e65bcf96
2022-03-09 07:20:30 +00:00
lucaslin
652527b496
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I8d31577fb64d959949b1c2aed51e482cb54a57ac
2022-03-09 06:55:34 +00:00
lucaslin
14e88ca2f9
Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I417c9687ae22749f428a902a01612c50cbf0e52c
2022-03-09 06:32:20 +00:00
lucaslin
2c1c76cd35
Hide private DNS settings UI in Guest mode am: 52e863b5a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063
Change-Id: I5fc7b5001299b8831a1dd9440b6e25dfaf6d8a98
2022-03-09 06:08:16 +00:00
Chaohui Wang
b4c3817a65
Fix App Compatibility Settings' lifecycle
...
When "Don't keep activities" enabled, it used to be unusable.
Bug: 222226636
Test: On Pixel device
Change-Id: I11718bea90cecfb7ee455fba9059bb09ffb72016
2022-03-09 03:05:47 +00:00
lucaslin
52e863b5a2
Hide private DNS settings UI in Guest mode
...
Hide private DNS settings UI in Guest mode to prevent guest
users modifying global private DNS settings.
Bug: 206987762
Test: 1. make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
2. Switch to Guest user and check if the private DNS UI is
hidden or not.
Change-Id: Iebfb8684da3be32110decd9e8447dd07b1c40387
2022-03-09 02:54:12 +00:00
Eric Biggers
e5f19ebc15
[automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2 am: fa38c498dc -s ours
...
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 1d48df59e5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I4dc70b56c7a568fa10dfd43a422ccf884690f2bf
2022-03-08 19:34:15 +00:00
Eric Biggers
799f84fd1c
[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours
...
am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b8f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: Ia7dc1f1dd76688109812a9daf3c12350c287e2a3
2022-03-08 19:34:13 +00:00
Eric Biggers
31509c8d31
[automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours
...
am skip reason: Merged-In I3ce9894291ea1f1886f21980a86a92bfce38038a with SHA-1 9b18c5d081 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: I47515daecb8ac43371ad45e08ffd2eafb744d250
2022-03-08 19:34:12 +00:00
Eric Biggers
2ff19ce69b
[automerger skipped] Remove CryptKeeper am: 438c3af097 am: 94ebb2e9e5 -s ours
...
am skip reason: Merged-In I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9 with SHA-1 f8ca0a448c is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: Ib73b9312a040da6c953f4335b759f4cc638507f1
2022-03-08 19:34:10 +00:00
Eric Biggers
fa38c498dc
Merge changes from topic "remove-fde" am: 12ba0209a2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945501
Change-Id: I3dbcdd90b3ed14925efa3990d3ce5fa2bab8e0a5
2022-03-08 19:04:13 +00:00
Eric Biggers
cc91b63c1e
Rename crypt_keeper_* strings that are still used am: 64dc746a68
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: I48310f08c631cf9e88aae449701cb78e51ae852e
2022-03-08 19:04:11 +00:00
Eric Biggers
8ec618fc14
Remove CryptKeeperSettings am: 922a11f659
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945499
Change-Id: Ib992c8f76022237f088f8cef402fa99e125c9c83
2022-03-08 19:04:10 +00:00
Eric Biggers
94ebb2e9e5
Remove CryptKeeper am: 438c3af097
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: I88a8b9792ad9a0b87cd719baf066a9b337f32d79
2022-03-08 19:04:08 +00:00
Eric Biggers
12ba0209a2
Merge changes from topic "remove-fde"
...
* changes:
Remove FDE support from accessibility settings
Rename crypt_keeper_* strings that are still used
Remove CryptKeeperSettings
Remove CryptKeeper
2022-03-08 18:37:00 +00:00
Eric Biggers
64dc746a68
Rename crypt_keeper_* strings that are still used
...
Some strings used in the Settings UI have "crypt_keeper" in their names,
but they aren't specific to FDE, which is no longer supported. They are
still used to report the encrypted status of the device on devices that
use FBE, or the unencrypted status of the device on devices that don't
have encryption enabled at all. Rename these strings appropriately.
Test: On Cuttlefish with and without encryption enabled, tested visiting
the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: Ic63910c870837f5b37e4407ba5b3c7629e925c17
(cherry picked from commit 6552bdd0ef )
Merged-In: Ic63910c870837f5b37e4407ba5b3c7629e925c17
2022-03-08 17:13:22 +00:00
Eric Biggers
922a11f659
Remove CryptKeeperSettings
...
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.
For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings. Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.
Test: On Cuttlefish with and without encryption enabled, tested visiting
the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18d1 )
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
2022-03-08 17:13:22 +00:00
Eric Biggers
438c3af097
Remove CryptKeeper
...
Since Android 10, new devices have been required to use FBE (File Based
Encryption) instead of FDE (Full Disk Encryption). FDE support was
already removed from system components such as init and vold.
Therefore, the CryptKeeper activity is no longer needed. Remove it.
Note: this CL only removes CryptKeeper itself, i.e. the activity which
runs at boot time on devices that are using FDE or are being encrypted
with FDE in-place. Later CLs will remove FDE-specific code from the
Settings app.
Bug: 208476087
Change-Id: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
(cherry picked from commit 43616ed3b6 )
Merged-In: I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9
2022-03-08 17:13:22 +00:00
Eric Biggers
c300a01bf4
Remove FDE support from accessibility settings
...
With FDE (Full Disk Encryption), secure start-up (i.e. requiring a PIN /
pattern / password to boot the device) was incompatible with
accessibility services. Thus, the accessibility settings would ask the
user to disable secure start-up when enabling an accessibility service.
Now that FDE support has been removed in favor of FBE (File Based
Encryption), this is no longer necessary. Remove it.
Bug: 208476087
Change-Id: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
(cherry picked from commit b4060ef65b )
Merged-In: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
2022-03-08 17:13:22 +00:00
Eric Biggers
a00c327707
Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp
...
* changes:
Remove FDE support from accessibility settings
Rename crypt_keeper_* strings that are still used
Remove CryptKeeperSettings
Remove CryptKeeper
2022-03-08 17:11:15 +00:00
Presubmit Automerger Backend
15d0cfed3a
[automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Bug: 201519976
Change-Id: I308c520fe768dcfc1276c125e05c4203b39be2c7
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:38 +00:00
Alex Johnston
bc4fd99ddb
Change default USB configuration to a RestrictedPreference
...
Test: manual with TestDPC and Settings
DefaultUsbConfigurationPreferenceControllerTest
Bug: 201519976
205996517
Change-Id: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:18 +00:00
Etienne Ruffieux
8db7f1a81d
Replced BluetoothCodecStatus creator by Builder
...
Bug: 222540543
Test: atest BluetoothCodecsTest
Tag: #feature
Change-Id: I2585b1bac9044add2dd072ed2effc3e61e4b1223
2022-03-08 13:35:07 +00:00
Xin Li
0cf175a248
[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours
...
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280
Change-Id: I27a745bdaa46d24d78ae8e50419c987a944cbb3e
2022-03-08 11:06:35 +00:00
Xin Li
d77cc96126
[automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours
...
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280
Change-Id: Ie0cf9b959ab83a2cb9a838cfda6ee74375483a78
2022-03-08 11:03:49 +00:00
Xin Li
4ea5f0e2e9
[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours
...
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280
Change-Id: I73dcd25ab649c74543ba7a30c86bc5752648a624
2022-03-08 10:21:48 +00:00
Xin Li
809f99056f
[automerger skipped] Merge Android 12L am: 821558107d -s ours
...
am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280
Change-Id: I044bf2318465b13d4b88093402659c46e6575f65
2022-03-08 10:18:58 +00:00
Xin Li
41790c684b
Merge "Merge Android 12L"
2022-03-08 06:51:46 +00:00
Xin Li
821558107d
Merge Android 12L
...
Bug: 222710654
Merged-In: Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f
Change-Id: If95800025d050393cf92c4f20724c973b154a4ac
2022-03-08 00:19:27 +00:00
Eric Biggers
1d48df59e5
Remove FDE support from accessibility settings
...
With FDE (Full Disk Encryption), secure start-up (i.e. requiring a PIN /
pattern / password to boot the device) was incompatible with
accessibility services. Thus, the accessibility settings would ask the
user to disable secure start-up when enabling an accessibility service.
Now that FDE support has been removed in favor of FBE (File Based
Encryption), this is no longer necessary. Remove it.
Bug: 208476087
Change-Id: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
(cherry picked from commit b4060ef65b )
Merged-In: I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f
2022-03-07 22:18:48 +00:00