mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 05:35:54 +00:00
964877bbf6
wgetb96ee4a2d1.patch -O telephony-01.patch wgetc16e6e78c1.patch -O media-01.patch wgetd5771450d7.patch -O media-02.patch wgeta1370bd00c.patch -O nn-01.patch wgetce2776f4ca.patch -O bt-01.patch wget585f583ef5.patch -O bt-02.patch wgetc9905e7968.patch -O bt-03.patch wgetc93ec045f5.patch -O bt-04.patch wget89fb17d172.patch -O bt-05.patch wget14aed2455e.patch -O bt-06.patch wgetcd438ebc52.patch -O bt-07.patch wget27e7cdc4e5.patch -O nfc-01.patch wgetdfeb4270b8.patch -O launcher-01.patch wgetb1993f6cec.patch -O native-01.patch wgetdf4a9362cd.patch -O fwb-01.patch wgetb55563bb9d.patch -O fwb-02.patch wgeta80971a281.patch -O fwb-03.patch wget7e173b4383.patch -O fwb-04.patch wget44191b1c6b.patch -O fwb-05.patch wget8dc8dfe572.patch -O fwb-06.patch wget00a4224100.patch -O av-01.patch wget21623d1f43.patch -O settings-01.patch wgetfa5ec443d9.patch -O settings-02.patch wgetba4da9c7b3.patch -O settings-03.patch Signed-off-by: Tad <tad@spotco.us>
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From d5771450d7b2acde9fa051dedbb6c115b001d48b Mon Sep 17 00:00:00 2001
|
|
From: Dipankar Bhardwaj <dipankarb@google.com>
|
|
Date: Thu, 6 Jul 2023 10:01:20 +0000
|
|
Subject: [PATCH] Canonicalize file path for insertion by legacy apps
|
|
|
|
Apps with legacy external storage can try to create entries in MP for
|
|
file paths in other apps external private directories by using a
|
|
non-canonical path in insertion calls.
|
|
|
|
Test: atest LegacyStorageHostTest#testInsertToOtherAppPrivateDirFails
|
|
Bug: 276898626
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3c0f583f5dc3f4d395fa2423ab72dbd902c0c6c8)
|
|
Merged-In: If4c941c8156f19459b3ec6cbaf705824ecc2ba77
|
|
Change-Id: If4c941c8156f19459b3ec6cbaf705824ecc2ba77
|
|
---
|
|
src/com/android/providers/media/util/FileUtils.java | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/com/android/providers/media/util/FileUtils.java b/src/com/android/providers/media/util/FileUtils.java
|
|
index 2e2a3e761..097eca8c9 100644
|
|
--- a/src/com/android/providers/media/util/FileUtils.java
|
|
+++ b/src/com/android/providers/media/util/FileUtils.java
|
|
@@ -1324,9 +1324,17 @@ public static void computeValuesFromData(@NonNull ContentValues values, boolean
|
|
values.remove(MediaColumns.BUCKET_ID);
|
|
values.remove(MediaColumns.BUCKET_DISPLAY_NAME);
|
|
|
|
- final String data = values.getAsString(MediaColumns.DATA);
|
|
+ String data = values.getAsString(MediaColumns.DATA);
|
|
if (TextUtils.isEmpty(data)) return;
|
|
|
|
+ try {
|
|
+ data = new File(data).getCanonicalPath();
|
|
+ values.put(MediaColumns.DATA, data);
|
|
+ } catch (IOException e) {
|
|
+ throw new IllegalArgumentException(
|
|
+ String.format(Locale.ROOT, "Invalid file path:%s in request.", data));
|
|
+ }
|
|
+
|
|
final File file = new File(data);
|
|
final File fileLower = new File(data.toLowerCase(Locale.ROOT));
|
|
|