diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-11 23:19:45 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-11 23:19:45 +0000 |
| commit | 210b82c10f2bc29e06b73aaceb7ba449b49399b2 (patch) | |
| tree | dbb7d1d1849d56fce11824767070bf7fd54d2c2d | |
| parent | b2f284cff3196fa395dc9cf0d5397f165b8cbd71 (diff) | |
| parent | a4fffacf49514641fe2f33ef0e0b489e166d1223 (diff) | |
| download | MediaProvider-210b82c10f2bc29e06b73aaceb7ba449b49399b2.tar.gz | |
Snap for 10478082 from a4fffacf49514641fe2f33ef0e0b489e166d1223 to udc-d1-release
Change-Id: I7317e5786f7a53e8d2e38a5474267b22b3e39193
| -rw-r--r-- | src/com/android/providers/media/util/FileUtils.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/providers/media/util/FileUtils.java b/src/com/android/providers/media/util/FileUtils.java index d6296ae08..376cdf355 100644 --- a/src/com/android/providers/media/util/FileUtils.java +++ b/src/com/android/providers/media/util/FileUtils.java @@ -1327,9 +1327,17 @@ public class FileUtils { 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)); |