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

Commit 74400b2e authored by Andreas Huber's avatar Andreas Huber Committed by android-build-merger
Browse files

Merge "Fixes Treble marshaling of strings embedded in structures from Java"... 

Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c0 am: 0bae9b14 am: 0e686542
am: 390cd6ce

Change-Id: I0b1ba7490adaaec8f4eaa7e4afada7425f8c1129
parents 489ce07b 390cd6ce

core/jni/android_os_HwBlob.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ static void JHwBlob_native_putString( 
    s = nullptr;

    s = nullptr;





    hidl_string tmp;

    hidl_string tmp;

    tmp.setToExternal(static_cast<const char *>(subBlob->data()), size);

    tmp.setToExternal(static_cast<const char *>(subBlob->data()), size - 1);





    sp<JHwBlob> blob = JHwBlob::GetNativeContext(env, thiz);

    sp<JHwBlob> blob = JHwBlob::GetNativeContext(env, thiz);

    blob->write(offset, &tmp, sizeof(tmp));

    blob->write(offset, &tmp, sizeof(tmp));