tree c0c78a17f1a347899d08e5fbfba383c9f8b02772
parent e89246a4860a0b1d6c782cdd50a641ec42a987ba
parent 0a88b1323001939feaf41bb6b4b3beb7a94ea01c
author Kevin F. Haggerty <haggertk@lineageos.org> 1696613533 -0600
committer Kevin F. Haggerty <haggertk@lineageos.org> 1696613543 -0600
mergetag object 0a88b1323001939feaf41bb6b4b3beb7a94ea01c
 type commit
 tag android-security-13.0.0_r10
 tagger The Android Open Source Project <initial-contribution@android.com> 1696266645 -0700
 
 Android Security 13.0.0 Release 10 (10763433)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZRr5lQAKCRDorT+BmrEO
 eA6vAKCN99GGJiFPeUxd64oMUctbR7GW3QCeKMk6RCYihce+wGbpFmNzixP/koQ=
 =O7tV
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEA2skEMxbPHNb/U7LbZVRKTMRJykFAmUgRKwACgkQbZVRKTMR
 JykDDw//dN6HTngRibe+Ler7dsUorNwU1OuZL6qnw/EPu8RITpbenUU35al63yJg
 tZkAqnMkG5cpEYFEwV/dHPMHnpn5pa532WT2hZPvPUmAOiemYJ5LAoePIs9X2m2+
 KL08vmHq/Zt/Rchtoc1G1lSLI6sGvLDc1Ts75rkigCp5eAWsJadprqoe2jh+TvEf
 Tc8lGYtun1ahdw4fXRU6xacDmAMoeWTiUA6EpFAO9aT9k1Ze8oROF6usfz84zSWS
 Pfgm+frUlMAsB1VxOPRW67NI8zjIQP6zprDebd1B9WUF9NuZr67fb6pW0qVo8BvN
 Vn2/5+Rtks9ifJCO/l2BAcvOsdElMx6jY5uovHdjrpHJpYMDibucckLzEFbpJgct
 ooBxUnlDaphstHL77Qd42Icoi9SMmCA5k4j8fiofTCTWWZMA23beTakqzW0PS/wz
 NlOQ0PhB4Y8AsgpX8YaU9cT0Wl/w61oFvdH3HgrhZRtHa2ugul8nKlsJ66YSuV+B
 3zCYMh0C2TJOhPdZcgYadvVPaXkkdEoYLB1HZUpKTuKriYVH1fPo1BCSs7oEJ3mF
 i37ScUcJw3ycfXZcD+FX0bR3k8Vf3s4WXUDZYpz8yofZFMNUtfYLyUBkbW9kS/tR
 A5hON33ov8NdxvWLWbKE728IbZEKbH6csD6/H8G88JuU7XJ9G0o=
 =Bi8v
 -----END PGP SIGNATURE-----

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