summaryrefslogtreecommitdiff
path: root/native
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-09-14 00:44:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-14 00:44:57 +0000
commitac345f8500664c51173eb7447b78846a89499c22 (patch)
tree312e713e869ffa47c5e88c2fdcb5191d41808dfb /native
parent6905298aea9a4a52e1ac2e857031e789e51a7dac (diff)
parent7a976b65fe2cdbe19620d12ce16839ea7e663955 (diff)
downloadbase-ac345f8500664c51173eb7447b78846a89499c22.tar.gz
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72 am: 834467bdcc am: de14ea1930 am: 7a976b65fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044 Change-Id: Id23e30ebeec4ddefc589a208bf5925cb2fa1816c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'native')
-rw-r--r--native/android/obb.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/obb.cpp b/native/android/obb.cpp
index e9900249b289..a14fa7e58fa8 100644
--- a/native/android/obb.cpp
+++ b/native/android/obb.cpp
@@ -42,7 +42,7 @@ void AObbInfo_delete(AObbInfo* obbInfo) {
}
const char* AObbInfo_getPackageName(AObbInfo* obbInfo) {
- return obbInfo->getPackageName();
+ return obbInfo->getPackageName().c_str();
}
int32_t AObbInfo_getVersion(AObbInfo* obbInfo) {