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

Commit 1adee708 authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "Remove the enforce to build 32 binary"

parents 3bd2a539 8a8bfd18

cas/1.0/default/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ cc_defaults { 
      "TypeConvert.cpp",

    ],



    compile_multilib: "32",



    shared_libs: [

      "android.hardware.cas@1.0",

      "android.hardware.cas.native@1.0",

cas/1.0/default/DescramblerImpl.cpp

+8 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "android.hardware.cas@1.0-DescramblerImpl"



#include <hidlmemory/mapping.h>

#include <inttypes.h>

#include <media/cas/DescramblerAPI.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/AString.h>
@@ -101,7 +102,7 @@ Return<void> DescramblerImpl::descramble( 
    // size in size_t. If size is over SIZE_MAX, mapMemory mapMemory could succeed

    // but the mapped memory's actual size will be smaller than the reported size.

    if (srcBuffer.heapBase.size() > SIZE_MAX) {

        ALOGE("Invalid hidl_memory size: %llu", srcBuffer.heapBase.size());

        ALOGE("Invalid hidl_memory size: %" PRIu64 "", srcBuffer.heapBase.size());

        android_errorWriteLog(0x534e4554, "79376389");

        _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

        return Void();
@@ -118,8 +119,8 @@ Return<void> DescramblerImpl::descramble( 
    }

    if (!validateRangeForSize(

            srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize())) {

        ALOGE("Invalid src buffer range: offset %llu, size %llu, srcMem size %llu",

                srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize());

        ALOGE("Invalid src buffer range: offset %" PRIu64 ", size %" PRIu64 ", srcMem"

              "size %" PRIu64 "", srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize());

        android_errorWriteLog(0x534e4554, "67962232");

        _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

        return Void();
@@ -135,8 +136,8 @@ Return<void> DescramblerImpl::descramble( 
    // is consistent with the source shared buffer size.

    if (!validateRangeForSize(srcOffset, totalBytesInSubSamples, srcBuffer.size)) {

        ALOGE("Invalid srcOffset and subsample size: "

                "srcOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu",

                srcOffset, totalBytesInSubSamples, srcBuffer.size);

                "srcOffset %" PRIu64 ", totalBytesInSubSamples %" PRIu64 ", srcBuffer"

                "size %" PRIu64 "", srcOffset, totalBytesInSubSamples, srcBuffer.size);

        android_errorWriteLog(0x534e4554, "67962232");

        _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

        return Void();
@@ -153,8 +154,8 @@ Return<void> DescramblerImpl::descramble( 
        // dstOffset against the buffer size too.

        if (!validateRangeForSize(dstOffset, totalBytesInSubSamples, srcBuffer.size)) {

            ALOGE("Invalid dstOffset and subsample size: "

                    "dstOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu",

                    dstOffset, totalBytesInSubSamples, srcBuffer.size);

                    "dstOffset %" PRIu64 ", totalBytesInSubSamples %" PRIu64 ", srcBuffer"

                    "size %" PRIu64 "", dstOffset, totalBytesInSubSamples, srcBuffer.size);

            android_errorWriteLog(0x534e4554, "67962232");

            _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

            return Void();

cas/1.1/default/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ cc_defaults { 
      "TypeConvert.cpp",

    ],



    compile_multilib: "32",



    shared_libs: [

      "android.hardware.cas@1.0",

      "android.hardware.cas@1.1",

cas/1.1/default/DescramblerImpl.cpp

+8 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "android.hardware.cas@1.1-DescramblerImpl"



#include <hidlmemory/mapping.h>

#include <inttypes.h>

#include <media/cas/DescramblerAPI.h>

#include <media/hardware/CryptoAPI.h>

#include <media/stagefright/foundation/AUtils.h>
@@ -92,7 +93,7 @@ Return<void> DescramblerImpl::descramble(ScramblingControl scramblingControl, 
    // size in size_t. If size is over SIZE_MAX, mapMemory mapMemory could succeed

    // but the mapped memory's actual size will be smaller than the reported size.

    if (srcBuffer.heapBase.size() > SIZE_MAX) {

        ALOGE("Invalid hidl_memory size: %llu", srcBuffer.heapBase.size());

        ALOGE("Invalid hidl_memory size: %" PRIu64 "", srcBuffer.heapBase.size());

        android_errorWriteLog(0x534e4554, "79376389");

        _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

        return Void();
@@ -108,8 +109,8 @@ Return<void> DescramblerImpl::descramble(ScramblingControl scramblingControl, 
        return Void();

    }

    if (!validateRangeForSize(srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize())) {

        ALOGE("Invalid src buffer range: offset %llu, size %llu, srcMem size %llu",

              srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize());

        ALOGE("Invalid src buffer range: offset %" PRIu64 ", size %" PRIu64 ", srcMem"

              "size %" PRIu64 "", srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize());

        android_errorWriteLog(0x534e4554, "67962232");

        _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

        return Void();
@@ -125,8 +126,8 @@ Return<void> DescramblerImpl::descramble(ScramblingControl scramblingControl, 
    // is consistent with the source shared buffer size.

    if (!validateRangeForSize(srcOffset, totalBytesInSubSamples, srcBuffer.size)) {

        ALOGE("Invalid srcOffset and subsample size: "

              "srcOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu",

              srcOffset, totalBytesInSubSamples, srcBuffer.size);

              "srcOffset %" PRIu64 ", totalBytesInSubSamples %" PRIu64 ", srcBuffer"

              "size %" PRIu64 "", srcOffset, totalBytesInSubSamples, srcBuffer.size);

        android_errorWriteLog(0x534e4554, "67962232");

        _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

        return Void();
@@ -143,8 +144,8 @@ Return<void> DescramblerImpl::descramble(ScramblingControl scramblingControl, 
        // dstOffset against the buffer size too.

        if (!validateRangeForSize(dstOffset, totalBytesInSubSamples, srcBuffer.size)) {

            ALOGE("Invalid dstOffset and subsample size: "

                  "dstOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu",

                  dstOffset, totalBytesInSubSamples, srcBuffer.size);

                  "dstOffset %" PRIu64 ", totalBytesInSubSamples %" PRIu64 ", srcBuffer"

                  "size %" PRIu64 "", dstOffset, totalBytesInSubSamples, srcBuffer.size);

            android_errorWriteLog(0x534e4554, "67962232");

            _hidl_cb(toStatus(BAD_VALUE), 0, NULL);

            return Void();

cas/1.2/default/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ cc_defaults { 
      "TypeConvert.cpp",

    ],



    compile_multilib: "32",



    shared_libs: [

      "android.hardware.cas@1.0",

      "android.hardware.cas@1.1",