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

Commit f216ea1d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix DvrClient data type" into tm-dev am: 88efebe4 

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

Change-Id: Ie2a40fb3237eaa68d5f01690293e8c7e85030d1a
parents 90b20ce0 88efebe4

media/jni/android_media_tv_Tuner.cpp

+4 −2
Original line number Diff line number Diff line
@@ -4592,7 +4592,8 @@ static jlong android_media_tv_Tuner_read_dvr_from_array( 
        ALOGD("Failed to GetByteArrayElements");

        return -1;

    }

    long realSize = dvrClient->readFromBuffer(reinterpret_cast<signed char *>(src) + offset, size);

    int64_t realSize =

            dvrClient->readFromBuffer(reinterpret_cast<signed char *>(src) + offset, size);

    env->ReleaseByteArrayElements(buffer, src, 0);

    return (jlong)realSize;

}
@@ -4624,7 +4625,8 @@ static jlong android_media_tv_Tuner_write_dvr_to_array( 
        return -1;

    }



    long realSize = dvrClient->writeToBuffer(reinterpret_cast<signed char *>(dst) + offset, size);

    int64_t realSize =

            dvrClient->writeToBuffer(reinterpret_cast<signed char *>(dst) + offset, size);

    env->ReleaseByteArrayElements(buffer, dst, 0);

    return (jlong)realSize;

}