commit 2a2acb0682094d721df5a7a69e0708f94288a7bc
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 11 03:29:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 03:29:52 2017 +0000
tree 1d8ec79bcc56fc9fd7300a267f2d0bbc239da337
parent 10bfcad7f78de3c1c61ed088d2c8c91785b0cb83
parent 9b8dd60f0d4cc2503266fa49b1ae74ad78051c2b

Merge "Cleanup handle when remote is dead" into oc-dev

schedulerservice/1.0/Android.bp

diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 9763d7d..c47821c 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "android.frameworks.schedulerservice@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
     srcs: [
         ":android.frameworks.schedulerservice@1.0_hal",
     ],
@@ -22,7 +22,7 @@
 genrule {
     name: "android.frameworks.schedulerservice@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.schedulerservice@1.0",
     srcs: [
         ":android.frameworks.schedulerservice@1.0_hal",
     ],

sensorservice/1.0/Android.bp

diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index 8c82b69..5391071 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -14,7 +14,7 @@
 genrule {
     name: "android.frameworks.sensorservice@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
     srcs: [
         ":android.frameworks.sensorservice@1.0_hal",
     ],
@@ -30,7 +30,7 @@
 genrule {
     name: "android.frameworks.sensorservice@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.sensorservice@1.0",
     srcs: [
         ":android.frameworks.sensorservice@1.0_hal",
     ],

sensorservice/libsensorndkbridge/ASensorManager.cpp

diff --git a/sensorservice/libsensorndkbridge/ASensorManager.cpp b/sensorservice/libsensorndkbridge/ASensorManager.cpp
index fefc92c..821ed20 100644
--- a/sensorservice/libsensorndkbridge/ASensorManager.cpp
+++ b/sensorservice/libsensorndkbridge/ASensorManager.cpp
@@ -21,6 +21,7 @@
 #define LOG_TAG "libsensorndkbridge"
 #include <android-base/logging.h>
 #include <android/looper.h>
+#include <hidl/HidlTransportSupport.h>
 #include <sensors/convert.h>
 
 using android::hardware::sensors::V1_0::SensorInfo;
@@ -157,6 +158,7 @@
     sp<ASensorEventQueue> queue =
         new ASensorEventQueue(looper, ident, callback, data);
 
+    ::android::hardware::setMinSchedulerPolicy(queue, SCHED_FIFO, 98);
     Result result;
     Return<void> ret =
         mManager->createEventQueue(

vr/composer/1.0/Android.bp

diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index 8b23776..ea19437 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "android.frameworks.vr.composer@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
     srcs: [
         ":android.frameworks.vr.composer@1.0_hal",
     ],
@@ -22,7 +22,7 @@
 genrule {
     name: "android.frameworks.vr.composer@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.frameworks:frameworks/hardware/interfaces -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.frameworks.vr.composer@1.0",
     srcs: [
         ":android.frameworks.vr.composer@1.0_hal",
     ],