Merge "Update for v5.4 kernel headers." am: 2f9e75b87d am: ffe96dbe0c am: fc21535dc2

Change-Id: I7f6c4109d36113cbda140619c148a46a09768d37

2 files changed, 5 insertions, 15 deletions

diff --git a/Parcel.cpp b/Parcel.cpp
index 2efb00f..e5f2032 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -203,7 +203,7 @@ status_t flatten_binder(const sp<ProcessState>& /*proc*/,
 
             obj.flags = priority & FLAT_BINDER_FLAG_PRIORITY_MASK;
             obj.flags |= FLAT_BINDER_FLAG_ACCEPTS_FDS | FLAT_BINDER_FLAG_INHERIT_RT;
-            obj.flags |= (policy & 3) << FLAT_BINDER_FLAG_SCHEDPOLICY_SHIFT;
+            obj.flags |= (policy & 3) << FLAT_BINDER_FLAG_SCHED_POLICY_SHIFT;
             if (local->isRequestingSid()) {
                 obj.flags |= FLAT_BINDER_FLAG_TXN_SECURITY_CTX;
             }
diff --git a/binder_kernel.h b/binder_kernel.h
index 085c9cc..fdf5b1e 100644
--- a/binder_kernel.h
+++ b/binder_kernel.h
@@ -17,6 +17,10 @@
 #ifndef ANDROID_HARDWARE_BINDER_KERNEL_H
 #define ANDROID_HARDWARE_BINDER_KERNEL_H
 
+/**
+ * Only need this file to fix the __packed__ keyword.
+ */
+
 // TODO(b/31559095): bionic on host
 #ifndef __ANDROID__
 #define __packed __attribute__((__packed__))
@@ -24,18 +28,4 @@
 
 #include <linux/android/binder.h>
 
-/**
- * This file exists because the uapi kernel headers in bionic are built
- * from upstream kernel headers only, and not all of the hwbinder kernel changes
- * have made it upstream yet. Therefore, the modifications to the
- * binder header are added locally in this file.
- */
-
-enum {
-        FLAT_BINDER_FLAG_SCHEDPOLICY_MASK = 0x600,
-        FLAT_BINDER_FLAG_SCHEDPOLICY_SHIFT = 9,
-        FLAT_BINDER_FLAG_INHERIT_RT = 0x800,
-};
-
-
 #endif // ANDROID_HARDWARE_BINDER_KERNEL_H