Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 150782bd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-369362fc-cc6c-4cb1-95c0-90b5ac7c52cb-for-git_oc-mr1-release-42... 

release-request-369362fc-cc6c-4cb1-95c0-90b5ac7c52cb-for-git_oc-mr1-release-4288633 snap-temp-L81700000095141745

Change-Id: I45e989f88bf170dc9fee5fd682ee25fbc3becc26
parents a859f163 7d203f39

include/android/sharedmem_jni.h

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ extern "C" { 
 * \param env The JNIEnv* pointer

 * \param sharedMemory The Java android.os.SharedMemory object

 * \return file descriptor that denotes the shared memory; -1 if the shared memory object is

 *      already closed or if the JNIEnv or jobject is NULL.

 *      already closed, if the JNIEnv or jobject is NULL, or if there are too many open file

 *      descriptors (errno=EMFILE)

 */

int ASharedMemory_dupFromJava(JNIEnv* env, jobject sharedMemory);

libs/ui/HdrCapabilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ status_t HdrCapabilities::unflatten(void const* buffer, size_t size) { 
    mMaxAverageLuminance = reinterpret_cast<float const&>(buf[1]);

    mMinLuminance        = reinterpret_cast<float const&>(buf[2]);

    if (itemCount) {

        mSupportedHdrTypes.reserve(itemCount);

        mSupportedHdrTypes.resize(itemCount);

        for (size_t i = 0; i < itemCount; ++i) {

            mSupportedHdrTypes[i] = buf[4 + i];

        }