[android8] Add fake SensorManager service. JB#44947

SensorManager service is needed on some Android 8 based devices.
Halium · Feb 26, 2019 · 77504eb · 77504eb
1 parent 3a5b55f
commit 77504eb
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 0 deletions.
diff --git a/Android.mk b/Android.mk
@@ -102,7 +102,9 @@ LOCAL_C_INCLUDES += frameworks/native/libs/sensor/include \
 LOCAL_SHARED_LIBRARIES += liblog \
                           libhidlbase \
                           libhidltransport \
+                          libhwbinder \
                           libsensor \
+                          [email protected] \
                           [email protected] \
                           [email protected]
 endif
@@ -130,7 +132,9 @@ LOCAL_C_INCLUDES := frameworks/native/libs/sensor/include \
 LOCAL_SHARED_LIBRARIES += liblog \
                           libhidlbase \
                           libhidltransport \
+                          libhwbinder \
                           libsensor \
+                          [email protected] \
                           [email protected] \
                           [email protected]
 endif
@@ -170,7 +174,9 @@ LOCAL_SHARED_LIBRARIES += liblog \
                           libcamera_client \
                           libhidlbase \
                           libhidltransport \
+                          libhwbinder \
                           libsensor \
+                          [email protected] \
                           [email protected] \
                           [email protected]
 endif

diff --git a/minimedia.cpp b/minimedia.cpp
@@ -84,6 +84,10 @@ main(int, char**)
         usleep(BINDER_SERVICE_CHECK_INTERVAL);
     } while (true);
     ALOGD("Allowing use of the camera for users root and bin");
+#if ANDROID_MAJOR >= 8
+    sp<android::frameworks::sensorservice::V1_0::ISensorManager> sensorManager = new FakeSensorManager;
+    status_t status = sensorManager->registerAsService();
+#endif
 #if ANDROID_MAJOR >= 7
     sp<hardware::ICameraService> gCameraService = interface_cast<hardware::ICameraService>(binder);
     std::vector<int32_t> users = {0, 1};

diff --git a/services/services_8_1_0.h b/services/services_8_1_0.h
@@ -447,3 +447,71 @@ class FakeResourceManagerService : public BinderService<FakeResourceManagerServi
     }
 };
 
+#include <android/frameworks/sensorservice/1.0/IEventQueue.h>
+#include <android/frameworks/sensorservice/1.0/ISensorManager.h>
+#include <android/frameworks/sensorservice/1.0/types.h>
+#include <android/hardware/sensors/1.0/types.h>
+
+class FakeEventQueue :
+    public android::frameworks::sensorservice::V1_0::IEventQueue
+{
+public:
+    FakeEventQueue() {}
+
+    android::hardware::Return<android::frameworks::sensorservice::V1_0::Result> enableSensor(
+            int32_t sensorHandle, int32_t samplingPeriodUs, int64_t maxBatchReportLatencyUs) {
+        return android::frameworks::sensorservice::V1_0::Result::BAD_VALUE;
+    }
+
+    android::hardware::Return<android::frameworks::sensorservice::V1_0::Result> disableSensor(
+            int32_t sensorHandle) {
+        return android::frameworks::sensorservice::V1_0::Result::BAD_VALUE;
+    }
+};
+
+class FakeSensorManager :
+    public android::frameworks::sensorservice::V1_0::ISensorManager
+{
+
+    // Methods from ::android::frameworks::sensorservice::V1_0::ISensorManager follow.
+    android::hardware::Return<void> getSensorList(getSensorList_cb _hidl_cb) {
+        android::hardware::hidl_vec<::android::hardware::sensors::V1_0::SensorInfo> ret;
+        _hidl_cb(ret, android::frameworks::sensorservice::V1_0::Result::OK);
+        return android::hardware::Void();
+    }
+
+    android::hardware::Return<void> getDefaultSensor(
+            android::hardware::sensors::V1_0::SensorType type,
+            getDefaultSensor_cb _hidl_cb) {
+        _hidl_cb({}, android::frameworks::sensorservice::V1_0::Result::NOT_EXIST);
+        return android::hardware::Void();
+    }
+
+    android::hardware::Return<void> createAshmemDirectChannel(
+            const android::hardware::hidl_memory& mem, uint64_t size,
+            createAshmemDirectChannel_cb _hidl_cb) {
+        _hidl_cb(nullptr, android::frameworks::sensorservice::V1_0::Result::BAD_VALUE);
+        return android::hardware::Void();
+    }
+
+    android::hardware::Return<void> createGrallocDirectChannel(
+            const android::hardware::hidl_handle& buffer, uint64_t size,
+            createGrallocDirectChannel_cb _hidl_cb) {
+        _hidl_cb(nullptr, android::frameworks::sensorservice::V1_0::Result::UNKNOWN_ERROR);
+        return android::hardware::Void();
+    }
+
+    android::hardware::Return<void> createEventQueue(
+            const sp<android::frameworks::sensorservice::V1_0::IEventQueueCallback> &callback,
+            createEventQueue_cb _hidl_cb) {
+        if (callback == nullptr) {
+            _hidl_cb(nullptr, android::frameworks::sensorservice::V1_0::Result::BAD_VALUE);
+            return android::hardware::Void();
+        }
+
+        sp<android::frameworks::sensorservice::V1_0::IEventQueue> queue = new FakeEventQueue();
+
+        _hidl_cb(queue, android::frameworks::sensorservice::V1_0::Result::OK);
+        return android::hardware::Void();
+    }
+};