PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,096 Commits 1 Branch 0 Tags
cf5300d19b0405763fa7b666473b68f2db2bc56b
Commit Graph

102096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b166e75474 [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: 37279f38c0 -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: I432edb48c04f584f2f72622cd79bf9f25e5dc51b
 2022-03-09 18:55:57 +00:00
TreeHugger Robot
88519ff899 [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf am: 409ac95f00 am: f56cc90557 -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: Ib995142ab0d46c5115b701678309f5aa9bac52ab
 2022-03-09 18:55:32 +00:00
TreeHugger Robot
cab6acc257 [automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 13a4331504 -s ours am: 88f2a7d4c6 -s ours am: 0990c049fa -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: I9870cc5c750db1364122ccd29d8eca3835568377
 2022-03-09 18:34:46 +00:00
TreeHugger Robot
19e912b05c [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27df2 -s ours am: c91fc6adf0 -s ours am: 0576c876ad -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: Ie1b24732c1259c8d3725e5aa2bf2cc90b780ab0b
 2022-03-09 18:34:15 +00:00
TreeHugger Robot
0990c049fa [automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 13a4331504 -s ours am: 88f2a7d4c6 -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: I173a3bcaa8ef5fe5a854a47bdeeb2282a7f833c9
 2022-03-09 18:33:48 +00:00
TreeHugger Robot
0576c876ad [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27df2 -s ours am: c91fc6adf0 -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: I42bc4ac871b07acf8debeff3105b4945a94f3698
 2022-03-09 18:32:38 +00:00
TreeHugger Robot
5b406006fe [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev am: 201fb5043a -s ours am: ebd92c6ee0 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: I4b274379c0f53be9e257ef830d8c9c377f09c21f
 2022-03-09 18:32:28 +00:00
Presubmit Automerger Backend
8216191e15 [automerger skipped] [automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92 am: 56da5fd632 -s ours am: 6f889ef7b8 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: If7d600da8be3355f96dea86d68e87985a61dc537
 2022-03-09 18:32:27 +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
88f2a7d4c6 [automerger skipped] Merge "Change default USB configuration to a RestrictedPreference" into sc-dev am: f48ae98972 -s ours am: 13a4331504 -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: I38fa873e56caeb6f28e87f84a27d4b79e8f13a4b
 2022-03-09 18:12:06 +00:00
TreeHugger Robot
c91fc6adf0 [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27df2 -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: I3e7dedf3263d073e833a4cd02c306eb1f888b340
 2022-03-09 18:12:00 +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
ebd92c6ee0 [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev am: 201fb5043a -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: Ied39446c5832204997fadcbacb3f52a483acf3fc
 2022-03-09 18:11:28 +00:00
Presubmit Automerger Backend
6f889ef7b8 [automerger skipped] [automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92 am: 56da5fd632 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: I8a5a6407d39b8b7940e40f4661f46be0136ae5e9
 2022-03-09 18:11:26 +00:00
TreeHugger Robot
aa0100e724 [automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev am: 201fb5043a -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: I8da0106c7da08f5e4f8730953df56aaa15e0e941
 2022-03-09 18:11:24 +00:00
Presubmit Automerger Backend
1d3b076702 [automerger skipped] [automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92 am: 56da5fd632 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 4a75dc192c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: I4662b9b8cf2c6b1b63b24ca238c393648bdac216
 2022-03-09 18:11:22 +00:00
TreeHugger Robot
13a4331504 [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: I58fa9d1ad2be1544545b8f769837166fe52d1456
 2022-03-09 18:11:06 +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
TreeHugger Robot
201fb5043a Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into tm-dev 
* changes:
  [automerged blank] Change default USB configuration to a RestrictedPreference 2p: bc4fd99ddb 2p: 407022ff92
  [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
TreeHugger Robot
71ded27df2 Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod 
* 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
TreeHugger Robot
f48ae98972 Merge "Change default USB configuration to a RestrictedPreference" into sc-dev 2022-03-09 17:54:27 +00:00
Peter_Liang
d2fc78d797 Fix that the theme of "Vision Settings" was inconsistent with "Anything else?". 
Remove theme attribute in the xml to avoid overriding.

Fix: 220127506
Fix: 219417232
Fix: 219415822
Fix: 223341110
Fix: 222415445
Fix: 219592951
Test: manual test
Change-Id: I8075be594714dfbd941cdcc642453500f093fc26
 2022-03-10 01:07:26 +08:00
Ricky Wai
ffc747e820 Show lock icon in restricted settings dialog 
Bug: 221847335
Test: After applying restricted settings, the dialog shows the icon now.
Change-Id: If4b55d4320956625141973c337ae7ef2a3bd8dbc
(cherry picked from commit 18602ea97a)
 2022-03-09 16:51:35 +00:00
Ricky Wai
d09d62a55e Apply restricted settings to notification access. 
Bug: 202130031
Test: Able to boot without error
Test: When app is installed by PackageInstaller app, notification
access is being restricted. The restriction is being removed after
turing it restricted settings off for that app.

Change-Id: I9c1fbc80dd2ca4cc483a60dfa9d043aaa99cde87
 2022-03-09 16:51:09 +00:00
Ricky Wai
dc13da6286 Merge "Show lock icon in restricted settings dialog" 2022-03-09 16:48:16 +00:00
Christian Göllner
2cc698cc9f Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev am: 5ff63a569c am: fb9ee84908 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17032838

Change-Id: I392a1d241f7927e05ba4ee64b5ea2b6261a17e82
 2022-03-09 15:57:32 +00:00
Christian Göllner
fb9ee84908 Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev am: 5ff63a569c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17032838

Change-Id: I636afe81f77967c6e2bb9471e6a172e74a4d1041
 2022-03-09 15:35:27 +00:00
Christian Göllner
e4b458a153 Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev am: 5ff63a569c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17032838

Change-Id: I64b9f79666467378b7cc41171658f79592dc17e9
 2022-03-09 15:35:21 +00:00
Christian Göllner
5ff63a569c Merge "Device state auto-rotation settings: log device state specific state changes" into tm-dev 2022-03-09 15:12:38 +00:00
Peter_Liang
2bfb31c877 Apply the settings lib style into the reset button of "Display size and text". 
Bug: 222415445
Fix: 220638395
Test: manual test
Change-Id: I001c9eff69f46f4ba142c3e5e428b1a92169ba7d
 2022-03-09 13:42:07 +00:00
Etienne Ruffieux
3ec173c126 Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85 am: b60c038016 am: cd09f9cbda am: 1412da33a5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316

Change-Id: Ied4c77abb5512b3fe8f80a9fe718a5875d81b118
 2022-03-09 13:23:50 +00:00
lucaslin
1e892e9215 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57 am: 1264191233 am: 51c66e24f3 am: 40086edf3f am: 2d04eec7f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: Ie77cd15655db735331dd1356f8b9a6ffcbe434a1
 2022-03-09 13:23:15 +00:00
Christian Göllner
982f5507c7 Device state auto-rotation settings: log device state specific state changes 
Bug: 221254073
Test: manually + unit tests
Change-Id: Ie8c0d1489d63fd2d19ad604816150b51ede4bb3b
 2022-03-09 13:00:55 +00:00
Eric Biggers
3c0ef1f828 [automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2 am: fa38c498dc -s ours am: e5f19ebc15 -s ours am: 323c5416ed -s ours am: b2b9447298 -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: I5e6c9831927b16f94e51f9cdb31165c6096f9ecf
 2022-03-09 12:58:57 +00:00
Eric Biggers
1cc453d61d [automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -s ours am: af1aa542b0 -s ours am: 2a1473fa93 -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: Id50e9d1c09f60931aef0453e8deb111a68051691
 2022-03-09 12:58:56 +00:00
Eric Biggers
9d763d79b2 [automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours am: 31509c8d31 -s ours am: 3bc698a145 -s ours am: 96663e9e76 -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: I53744966a71bfb5d4a691dca2c15eb2c2f4a478c
 2022-03-09 12:58:55 +00:00
Eric Biggers
a17c096d79 [automerger skipped] Remove CryptKeeper am: 438c3af097 am: 94ebb2e9e5 -s ours am: 2ff19ce69b -s ours am: da5edda772 -s ours am: 4ceb98220c -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: I2dc074e5e74a4e72948ba1096ad9f4325166943b
 2022-03-09 12:58:52 +00:00
Etienne Ruffieux
4d848ce050 Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85 am: b60c038016 am: cd09f9cbda 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316

Change-Id: I06adb63f1dcc6a00aea09944ca730fb435a6513c
 2022-03-09 12:36:01 +00:00
lucaslin
9a4fee29c3 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57 am: 1264191233 am: 51c66e24f3 am: 40086edf3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I50d3feec7b6a4dddb65ab5236e671130f2040955
 2022-03-09 12:35:07 +00:00
Eric Biggers
d4e91a1d54 [automerger skipped] Merge changes from topic "remove-fde" into sc-v2-dev-plus-aosp am: a00c327707 -s ours am: e92bac3118 -s ours am: 16808d4a63 -s ours 
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17110591

Change-Id: I8ab712872b27cf964b9fe7fbd6accf5028bebe91
 2022-03-09 12:34:53 +00:00
Eric Biggers
7e34863ff1 [automerger skipped] Remove FDE support from accessibility settings am: 1d48df59e5 -s ours am: 7e34dd199d -s ours am: ba01b74178 -s ours 
am skip reason: Merged-In I5f6e512f223df63e1b4d1c181fc8b3fe683dcd5f with SHA-1 b4060ef65b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17110591

Change-Id: I0258ba907a88d6b5418a4a147b3cce1814595696
 2022-03-09 12:34:46 +00:00
Etienne Ruffieux
1412da33a5 Merge "Replced BluetoothCodecStatus creator by Builder" am: 5dd7c32f93 am: 1a8bbc4a85 am: b60c038016 am: cd09f9cbda 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2015316

Change-Id: I16fc07700a12420b92a442dd1edea9b99452065e
 2022-03-09 12:25:12 +00:00
lucaslin
2d04eec7f8 Hide private DNS settings UI in Guest mode am: 52e863b5a2 am: 2c1c76cd35 am: 14e88ca2f9 am: 652527b496 am: b38110f853 am: 92245b8f57 am: 1264191233 am: 51c66e24f3 am: 40086edf3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129063

Change-Id: I67338648b22b0320cd36a0165fc4b608af8f72f4
 2022-03-09 12:22:09 +00:00
Automerger Merge Worker
cb7744ee27 Merge changes from topic "am-b7480b9a5044473a83123ed071d47e08" 
* changes:
  [automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours am: 0cf175a248 -s ours am: 41a3026a47 -s ours am: e59429af7c -s ours
  [automerger skipped] Merge Android 12L am: 821558107d -s ours am: 809f99056f -s ours am: d77cc96126 -s ours am: df5b4f0bad -s ours am: a28772f40c -s ours
 2022-03-09 12:18:00 +00:00
Eric Biggers
ac4d15ece9 [automerger skipped] Merge changes from topic "remove-fde" am: 12ba0209a2 am: fa38c498dc -s ours am: e5f19ebc15 -s ours am: 323c5416ed -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: I70549082fc0678b14059724be600c6607d875d6a
 2022-03-09 12:13:37 +00:00
Eric Biggers
f7bb57105c [automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -s ours am: af1aa542b0 -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: I2521e0de74142f79c8a3f603e10c0f4f419e89de
 2022-03-09 12:13:36 +00:00
Eric Biggers
313f27a752 [automerger skipped] Remove CryptKeeperSettings am: 922a11f659 am: 8ec618fc14 -s ours am: 31509c8d31 -s ours am: 3bc698a145 -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: I426db4d0a7493256569dccd962344ae0cb5daaad
 2022-03-09 12:13:35 +00:00