Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix include after spliting HidlSupport.h" am: efd7b9f57d am: 2f7a3f9595

Browse Source 
am: afe46992b8

Change-Id: If9b589ef262ae97e85dc851bd1a5f3fe3d4c22fa
This commit is contained in:
Yifan Hong
2016-11-16 19:24:09 +00:00
committed by android-build-merger
parent c89bd30cee afe46992b8
commit 7ae2aa4ed9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/android_os_HwBlob.h
View File

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

5
core/jni/android_os_HwParcel.cpp
View File

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