| commit | cbb7cf3ba7b1494d76d4b4667f1af43a57548afb | [log] [tgz] |
|---|---|---|
| author | Kevin F. Haggerty <haggertk@lineageos.org> | Fri Oct 06 11:32:13 2023 -0600 |
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | Fri Oct 06 11:32:23 2023 -0600 |
| tree | c0c78a17f1a347899d08e5fbfba383c9f8b02772 | |
| parent | e89246a4860a0b1d6c782cdd50a641ec42a987ba [diff] | |
| parent | 0a88b1323001939feaf41bb6b4b3beb7a94ea01c [diff] |
Merge tag 'android-security-13.0.0_r10' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-20.0_merge_android-security-13.0.0_r10 Android Security 13.0.0 Release 10 (10763433) * tag 'android-security-13.0.0_r10' of https://android.googlesource.com/platform/packages/apps/Settings: RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() [RESTRICT AUTOMERGE] Restrict ApnEditor settings Conflicts: src/com/android/settings/password/ChooseLockPattern.java tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java Change-Id: I17a1c1d33b2985daa882fe81ea8fde44cbad492a