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

Commit 61088950 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Gerrit Code Review
Browse files

Merge "Don't depend on String8 cast to C string [cas]" into main

parents 71d812a8 11a55db7

cas/1.0/default/DescramblerImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Return<bool> DescramblerImpl::requiresSecureDecoderComponent( 
        return false;

    }



    return holder->requiresSecureDecoderComponent(String8(mime.c_str()));

    return holder->requiresSecureDecoderComponent(mime.c_str());

}



static inline bool validateRangeForSize(

cas/1.1/default/DescramblerImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Return<bool> DescramblerImpl::requiresSecureDecoderComponent(const hidl_string& 
        return false;

    }



    return holder->requiresSecureDecoderComponent(String8(mime.c_str()));

    return holder->requiresSecureDecoderComponent(mime.c_str());

}



static inline bool validateRangeForSize(uint64_t offset, uint64_t length, uint64_t size) {

cas/1.2/default/DescramblerImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ Return<bool> DescramblerImpl::requiresSecureDecoderComponent(const hidl_string& 
        return false;

    }



    return holder->requiresSecureDecoderComponent(String8(mime.c_str()));

    return holder->requiresSecureDecoderComponent(mime.c_str());

}



static inline bool validateRangeForSize(uint64_t offset, uint64_t length, uint64_t size) {

cas/aidl/default/DescramblerImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ ScopedAStatus DescramblerImpl::requiresSecureDecoderComponent(const string& in_m 
        *_aidl_return = false;

    }



    *_aidl_return = holder->requiresSecureDecoderComponent(String8(in_mime.c_str()));

    *_aidl_return = holder->requiresSecureDecoderComponent(in_mime.c_str());

    return ScopedAStatus::ok();

}