Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748299

Change-Id: Ief959f2b38ac3aa2a8ecc98cbe1c98f2b2342b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tomasz Wasilczyk
2023-09-13 16:21:20 +00:00
committed by Automerger Merge Worker
parent 2aac8b216a 610889508f
commit 903a322bbe
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cas/1.0/default/DescramblerImpl.cpp
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(

2
cas/1.1/default/DescramblerImpl.cpp
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) {

2
cas/1.2/default/DescramblerImpl.cpp
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) {

2
cas/aidl/default/DescramblerImpl.cpp
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();
}