Merge "opengl: fix a race condition when unloading gl driver"
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 8751ecb..ed6c834 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -541,7 +541,7 @@
return err == NO_ERROR;
}
-uid_t Parcel::readCallingWorkSourceUid()
+uid_t Parcel::readCallingWorkSourceUid() const
{
if (!mRequestHeaderPresent) {
return IPCThreadState::kUnsetWorkSource;
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index 0a4f906..b1b8ff1 100644
--- a/libs/binder/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
@@ -21,8 +21,6 @@
#include <string>
#include <vector>
-#include <linux/android/binder.h>
-
#include <android-base/unique_fd.h>
#include <cutils/native_handle.h>
#include <utils/Errors.h>
@@ -34,11 +32,19 @@
#include <binder/IInterface.h>
#include <binder/Parcelable.h>
+#ifdef BINDER_IPC_32BIT
+typedef __u32 binder_size_t;
+#else
+typedef __u64 binder_size_t;
+#endif
+
+
// ---------------------------------------------------------------------------
namespace android {
template <typename T> class Flattenable;
template <typename T> class LightFlattenable;
+struct flat_binder_object;
class IBinder;
class IPCThreadState;
class ProcessState;
@@ -377,8 +383,7 @@
bool replaceCallingWorkSourceUid(uid_t uid);
// Returns the work source provided by the caller. This can only be trusted for trusted calling
// uid.
- uid_t readCallingWorkSourceUid();
- void readRequestHeaders() const;
+ uid_t readCallingWorkSourceUid() const;
private:
typedef void (*release_func)(Parcel* parcel,
diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp
index 495b2f9..5e0574a 100644
--- a/libs/binder/tests/binderLibTest.cpp
+++ b/libs/binder/tests/binderLibTest.cpp
@@ -28,6 +28,7 @@
#include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h>
+#include <private/binder/binder_module.h>
#include <sys/epoll.h>
#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
diff --git a/libs/vr/libdisplay/vsync_service.cpp b/libs/vr/libdisplay/vsync_service.cpp
index 4668b98..04d4f30 100644
--- a/libs/vr/libdisplay/vsync_service.cpp
+++ b/libs/vr/libdisplay/vsync_service.cpp
@@ -45,8 +45,8 @@
ALOGE("onVsync failed to writeInt64: %d", result);
return result;
}
- result = remote()->transact(
- BnVsyncCallback::ON_VSYNC, data, &reply, TF_ONE_WAY);
+ result = remote()->transact(BnVsyncCallback::ON_VSYNC, data, &reply,
+ IBinder::FLAG_ONEWAY);
if (result != OK) {
ALOGE("onVsync failed to transact: %d", result);
return result;