tree 0f47e731ce8f6d2721b3c421a348270c325fc2af
parent a54a6a476421ef2383b816b7b903b2d8dddc87bb
parent 9660ba0ebe60a4c7ad6fb81693c6d583d52ce368
author Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1696930873 +0530
committer Prashantsinh Parmar <prashantsinh.parmar@fairphone.partners> 1696937553 +0200

Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Fix path traversal vulnerabilities in MediaProvider
  Canonicalize file path for insertion by legacy apps
  Remove invalid surrogates during bindSelection

Change-Id: I9581c7e5c1889e93f4fc068a2eff6bc5d43c4d0a