Commit 48f29449 authored Aug 08, 2021 by Brian Carlstrom Committed by Automerger Merge Worker Aug 08, 2021

Merge "Remove spammy convertToModernFd log" into sc-dev am: eac1d5a4 am:...

Merge "Remove spammy convertToModernFd log" into sc-dev am: eac1d5a4 am: 988b01f4 am: 0f5220f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15472605

Change-Id: I21082b27083f515819a11c45bd47f2ac11b97b9a

core/java/android/os/FileUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1470,7 +1470,7 @@ public final class FileUtils {
		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;
		}
		}