tree ba7f6165a53bb8427bccb17679fd24749e4d8210
parent defc1fd89ae23d10b82d5c7462639a9becb85a8b
parent 2ad160a054f1a89866d88d8070e0ace4f7e4f972
author Karsten Tausche <karsten@fairphone.com> 1629997751 +0200
committer Karsten Tausche <karsten@fairphone.com> 1629997751 +0200
mergetag object 2ad160a054f1a89866d88d8070e0ace4f7e4f972
 type commit
 tag android-security-10.0.0_r54
 tagger The Android Open Source Project <initial-contribution@android.com> 1620084887 -0700
 
 Android Security 10.0.0 Release 54 (7250004)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYJCImAAKCRDorT+BmrEO
 eBJnAJ4j61anrdw+zD0YsUa+JBTMSItQ9gCdG7PnjpNtwDtlWV4REwVvNm+opYQ=
 =fAXg
 -----END PGP SIGNATURE-----

Merge tag 'android-security-10.0.0_r54' into int/10/fp2

Android Security 10.0.0 Release 54 (7250004)

* tag 'android-security-10.0.0_r54':
  RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
  Trigger mediascan after a download is completed.
  Don't canonicalize app paths in system.
  Fix NPE in DownloadProvider.
  Revert SQLiteQueryBuilder for now.

Change-Id: I738814e5170a1254760166fd836bbccb49d7519c