From fab4a97a7964020d76ebcb6d13817b6985cb3744 Mon Sep 17 00:00:00 2001 From: Daichi Hirono Date: Fri, 15 Jan 2016 16:54:24 +0900 Subject: Fix compile error introduced by ag/842950. BUG=25756419 Change-Id: I8ac270946b3915c02b21a07cf0a9c5b62d69effc --- packages/MtpDocumentsProvider/jni/com_android_mtp_AppFuse.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/MtpDocumentsProvider/jni/com_android_mtp_AppFuse.cpp b/packages/MtpDocumentsProvider/jni/com_android_mtp_AppFuse.cpp index eb9e8eba9f14..cde28fce1cc5 100644 --- a/packages/MtpDocumentsProvider/jni/com_android_mtp_AppFuse.cpp +++ b/packages/MtpDocumentsProvider/jni/com_android_mtp_AppFuse.cpp @@ -45,7 +45,7 @@ constexpr size_t NUM_MAX_HANDLES = 1024; // The request size is bounded by the maximum size of a FUSE_WRITE request // because it has the largest possible data payload. constexpr size_t MAX_REQUEST_SIZE = sizeof(struct fuse_in_header) + - sizeof(struct fuse_write_in) + std::max(MAX_WRITE, MAX_READ); + sizeof(struct fuse_write_in) + (MAX_WRITE > MAX_READ ? MAX_WRITE : MAX_READ); static jclass app_fuse_class; static jmethodID app_fuse_get_file_size; -- cgit v1.2.3-59-g8ed1b