| commit | 46a2b96892cc57bf5e7ec1fe551bff2775c7be13 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Sun Aug 08 21:10:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 08 21:10:56 2021 +0000 |
| tree | 49b954101062bad87a0948333e41236bf82b238a | |
| parent | f4ecbc4753be71926a66263a777e4a97a9d8f9f5 [diff] | |
| parent | 86acac468f74313da2235f9133b75ba92a3c7fba [diff] |
Merge "Remove spammy convertToModernFd log" into sc-dev am: eac1d5a41c am: 86acac468f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15472605 Change-Id: I1283f7a7da3eff7631cd762506ee7553ffff2063
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index 1bc6495..edfcb3d 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java
@@ -1470,7 +1470,7 @@ try (ParcelFileDescriptor dupFd = ParcelFileDescriptor.dup(fd)) { return MediaStore.getOriginalMediaFormatFileDescriptor(context, dupFd); } catch (Exception e) { - Log.d(TAG, "Failed to convert to modern format file descriptor", e); + // Ignore error return null; } }