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
56da5fd632
[automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb
2p: 407022ff92
...
Blank merge reason: Change-Id I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783
Bug: 201519976
Change-Id: I358fae127244d34d82b639b4a71993cfe14a8914
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:52 +00:00
PETER LIANG
51f927066f
Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a
am: 36d0d31cb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241
Change-Id: Iaf6e87fafb1f6654c823f80035d46417a41a9cdf
2022-03-08 16:10:41 +00:00
Presubmit Automerger Backend
407022ff92
[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: Id4e717096e077e2940a0d99e01448f3b1213d532
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
2022-03-08 16:10:39 +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
PETER LIANG
ffd60718b2
Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241
Change-Id: I802d641127336df06e15ed6448fb08c24cc5bceb
2022-03-08 15:46:37 +00:00
PETER LIANG
36d0d31cb5
Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev am: 3ccdcd433a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106241
Change-Id: Ib5040227ea7698c0abafae1e3c718bafda2d9e77
2022-03-08 15:46:29 +00:00
Lucas Silva
d9071dea25
Add master toggle to enable/disable screen savers
...
The new control toggles the Settings.Secure.SCREENSAVER_ENABLED setting,
which controls if a screen saver is enabled. Also removed the "Never"
option from the WhenToDream picker, since this is now controlled via the
toggle.
Test: locally on device
Bug: 222360260
Change-Id: Ibcf52b5e2d1ad0c295f32c4c18bfc89082d074ce
2022-03-08 10:27:59 -05:00
PETER LIANG
3ccdcd433a
Merge "Fix that the preview text in "Text and reading options" page is too small." into tm-dev
2022-03-08 15:17:10 +00:00
Marie Matheson
4af5f9b865
Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f
am: 3f137b2106
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287
Change-Id: Iebad314ea1354813b68269ef51b4f7a2c8447e9f
2022-03-08 14:57:45 +00:00
Marie Matheson
386fdd46a4
Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287
Change-Id: I2211e10d3b8ad36c25a428d51c66d95c12e686f4
2022-03-08 14:34:33 +00:00
Marie Matheson
3f137b2106
Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev am: 2adf0a066f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17107287
Change-Id: I093d02d5424a6354484612b5199770d20cb47502
2022-03-08 14:33:20 +00:00
Julia Reynolds
856cc0da65
Fix app notification toggle
...
Test: CTS Verifier 'Notification Listener Test'
Bug: 222372861
Change-Id: I060b8b9bf7b749736596676a3d98cd609dc65846
2022-03-08 09:18:56 -05:00
Marie Matheson
2adf0a066f
Merge "Minor bug fixes for Lockscreen Safety Center source" into tm-dev
2022-03-08 14:02:57 +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
Yuri Ufimtsev
76989c745d
Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488
am: 95a2bd08ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563
Change-Id: I83a593886fe8c6417a6ff5a8e3d4d83adcfed9e8
2022-03-08 12:57:57 +00:00
Yuri Ufimtsev
95a2bd08ab
Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563
Change-Id: Ib773f4a7bebcf7df7262558be8cd3d9a261860b5
2022-03-08 12:34:30 +00:00
Yuri Ufimtsev
2ea378651c
Merge "Inject different User IDs into biometric utils" into tm-dev am: 1985e02488
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17104563
Change-Id: I63c748656f255d1d795558594a8d2b214bd98eee
2022-03-08 12:34:02 +00:00
Yuri Ufimtsev
1985e02488
Merge "Inject different User IDs into biometric utils" into tm-dev
2022-03-08 12:13:20 +00:00
Stanley Wang
3f9f876142
Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398
am: f3e802f1d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484
Change-Id: I269968a5dbf1a17878b02afe2eb93379965762fd
2022-03-08 11:36:02 +00:00
TreeHugger Robot
8faca50c7d
Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c
am: f505ee9236
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264
Change-Id: I2c21994aa18b17ce2cce20fab6b685f0a497eaed
2022-03-08 11:35:04 +00:00
Stanley Wang
41f55133b0
Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484
Change-Id: I9d1052ebb2b997301659f8d34fbd5f335705d7ef
2022-03-08 11:08:44 +00:00
Stanley Wang
f3e802f1d7
Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev am: 5e4be73398
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17013484
Change-Id: I5cc7620247489909715876bfd27abbab4c73bfcc
2022-03-08 11:08:02 +00:00
TreeHugger Robot
e8c55967ec
Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264
Change-Id: Id3aabcc991a52cbcd12b7edf892922f559dd65db
2022-03-08 11:08:01 +00:00
TreeHugger Robot
f505ee9236
Merge "Change default USB configuration to a RestrictedPreference" into tm-dev am: 7d26b6273c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070264
Change-Id: I37dc0055304fd51eaa374a3f18f4ec205cd94b6e
2022-03-08 11:07:06 +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
Stanley Wang
5e4be73398
Merge "Fix the problem that voice search can not find the Use Battery Saver slice." into tm-dev
2022-03-08 10:30:03 +00:00
TreeHugger Robot
7d26b6273c
Merge "Change default USB configuration to a RestrictedPreference" into tm-dev
2022-03-08 10:29:42 +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
Stanley Wang
21564efa8b
Fix the problem that voice search can not find the
...
Use Battery Saver slice.
There is no title for preference in xml, so the preference cannot
be indexed.
Fix: 172276695
Test: manual test and see the UI
Change-Id: Ieb7836805e66515629064800e4119ca17b5ac2e0
2022-03-08 08:51:58 +00:00
Menghan Li
d8a9dbb9c1
Merge "Fix One handed mode Settings "Pull screen into reach" function fail" into tm-dev am: 0ece869924
am: 67c44d139f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106238
Change-Id: Ib631cf7cf4c0da2bc362aee535c6fc74058741c0
2022-03-08 08:45:17 +00:00
Menghan Li
67c44d139f
Merge "Fix One handed mode Settings "Pull screen into reach" function fail" into tm-dev am: 0ece869924
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106238
Change-Id: I2d839c0b1320ef0f54757fa3c501fa3e332c93fa
2022-03-08 08:22:04 +00:00
Menghan Li
1b005c86fb
Merge "Fix One handed mode Settings "Pull screen into reach" function fail" into tm-dev am: 0ece869924
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106238
Change-Id: I6bad6915651663496810358183ea727682cd58f1
2022-03-08 08:21:09 +00:00
Menghan Li
0ece869924
Merge "Fix One handed mode Settings "Pull screen into reach" function fail" into tm-dev
2022-03-08 07:51:12 +00:00
TreeHugger Robot
3a9d1f4eb0
Merge "Add user button UX update" into tm-dev am: 3e4c3d84c6
am: 3c45d8a0e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084549
Change-Id: I9250b1ba3db16e7ec3ba026e408602cf71cd3957
2022-03-08 07:08:55 +00:00
TreeHugger Robot
62cca04365
Merge "Modify the path message to correct path." into tm-dev am: 0cdfb9905b
am: 7022c61a56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106233
Change-Id: I6949d2aae512ddf94d148176bf098f98e2eb607c
2022-03-08 07:08:48 +00:00
Weng Su
190d871520
Restrict WiFi network connection
...
- Use StandardWifiEntry#canConnect() to determine if the network should
be disabled or not.
- Use StandardWifiEntry#getSummary() to retrieve the restriction message.
- Disabled WiFi network if it cannot connect.
- If WiFi network is connected or saved network, leave it enabled to
disconnect or configure.
- See the result screenshot in b/203168943#comment11
Bug: 203168938
Bug: 203168943
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=LongPressWifiEntryPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Merged-In: I04aafaa5b383598a0f87eea15d06b38bbc662b9e
Change-Id: I04aafaa5b383598a0f87eea15d06b38bbc662b9e
(cherry picked from commit f86bdc9c69
)
2022-03-08 07:06:30 +00:00
TreeHugger Robot
1c47226d17
Merge "Restrict WiFi network connection"
2022-03-08 07:00:37 +00:00
Xin Li
41790c684b
Merge "Merge Android 12L"
2022-03-08 06:51:46 +00:00
TreeHugger Robot
11829d1985
Merge "Add user button UX update" into tm-dev am: 3e4c3d84c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084549
Change-Id: Ic8539915b0efd672d1237d09530098a268411553
2022-03-08 06:47:10 +00:00
TreeHugger Robot
a3f073cbde
Merge "Modify the path message to correct path." into tm-dev am: 0cdfb9905b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106233
Change-Id: I048b47a774cb7f869f105873af9f9f1fc810f47b
2022-03-08 06:46:49 +00:00
TreeHugger Robot
3c45d8a0e2
Merge "Add user button UX update" into tm-dev am: 3e4c3d84c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17084549
Change-Id: I9989cb5c69b6c1490ef789ce664b76e87c3dc34c
2022-03-08 06:45:52 +00:00
TreeHugger Robot
7022c61a56
Merge "Modify the path message to correct path." into tm-dev am: 0cdfb9905b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17106233
Change-Id: I48f51a59fa54b192ce7482d797d5a3f37a29b7dd
2022-03-08 06:45:33 +00:00
TreeHugger Robot
3e4c3d84c6
Merge "Add user button UX update" into tm-dev
2022-03-08 06:42:32 +00:00
TreeHugger Robot
0cdfb9905b
Merge "Modify the path message to correct path." into tm-dev
2022-03-08 06:20:22 +00:00