| commit | b96dcef6bb55b5f69c7c16e5c858674c4f5e3b14 | [log] [tgz] |
|---|---|---|
| author | Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> | Tue Oct 10 15:11:13 2023 +0530 |
| committer | Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> | Tue Oct 10 13:33:37 2023 +0200 |
| tree | 3b9e0477947709dad3c890e80afba6ee15e43ec1 | |
| parent | 444554946199800764f894cfef24ffa86a875553 [diff] | |
| parent | 2fdcf6b6e204bfafec7df989bee8c9366ddf0f43 [diff] |
Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3 * dev/11/fp3/security-aosp-rvc-release: RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() Restrict ApnEditor settings DO NOT MERGE: Prevent non-system IME from becoming device admin Settings: don't try to allow NLSes with too-long component names DO NOT MERGE Don't hide approved NLSes in Settings Change-Id: I4147af6331399be28cc277d0464ed8fd4a2fb964