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

Commit efd7b9f5 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "Fix include after spliting HidlSupport.h"

parents 3b379ee9 ddf31f60

core/jni/android_os_HwBlob.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <android-base/macros.h>

#include <jni.h>

#include <hidl/HidlSupport.h>

#include <hwbinder/Parcel.h>

#include <utils/RefBase.h>

#include <utils/Vector.h>

core/jni/android_os_HwParcel.cpp

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <JNIHelp.h>

#include <android_runtime/AndroidRuntime.h>

#include <hidl/HidlTransportSupport.h>

#include <hidl/Status.h>

#include <nativehelper/ScopedLocalRef.h>
@@ -383,7 +384,7 @@ static void JHwParcel_native_writeStatus( 
    hardware::Parcel *parcel =

        JHwParcel::GetNativeContext(env, thiz)->getParcel();



    status_t err = status.writeToParcel(parcel);

    status_t err = ::android::hardware::writeToParcel(status, parcel);

    signalExceptionForError(env, err);

}
@@ -394,7 +395,7 @@ static void JHwParcel_native_verifySuccess(JNIEnv *env, jobject thiz) { 
        JHwParcel::GetNativeContext(env, thiz)->getParcel();



    Status status;

    status_t err = status.readFromParcel(*parcel);

    status_t err = ::android::hardware::readFromParcel(&status, *parcel);

    signalExceptionForError(env, err);

}