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

This commit is contained in:
Tomasz Wasilczyk
2023-09-13 15:48:24 +00:00
committed by Gerrit Code Review
4 changed files with 4 additions and 4 deletions

View File

@@ -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(

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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();
}