Use defaultPassthroughServiceImplementation.
Bug: 32279541
Bug: 32282345
Test: mma
Change-Id: Ic0222963c99bea41de7637e5f20c19d7c541cb97
diff --git a/graphics/allocator/2.0/default/service.cpp b/graphics/allocator/2.0/default/service.cpp
index fd89aa8..525b342 100644
--- a/graphics/allocator/2.0/default/service.cpp
+++ b/graphics/allocator/2.0/default/service.cpp
@@ -14,38 +14,15 @@
* limitations under the License.
*/
-#define LOG_TAG "GrallocService"
+#define LOG_TAG "android.hardware.graphics.allocator@2.0-service"
#include <android/hardware/graphics/allocator/2.0/IAllocator.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-#include <utils/StrongPointer.h>
-using android::sp;
-using android::hardware::IPCThreadState;
-using android::hardware::ProcessState;
+#include <hidl/LegacySupport.h>
+
using android::hardware::graphics::allocator::V2_0::IAllocator;
+using android::hardware::defaultPassthroughServiceImplementation;
-int main()
-{
- const char instance[] = "gralloc";
-
- ALOGI("Service is starting.");
-
- sp<IAllocator> service = IAllocator::getService(instance,
- true /* getStub */);
- if (service == nullptr) {
- ALOGI("getService returned NULL");
- return -1;
- }
-
- LOG_FATAL_IF(service->isRemote(), "Service is REMOTE!");
-
- service->registerAsService(instance);
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
-
- return 0;
+int main() {
+ return defaultPassthroughServiceImplementation<IAllocator>("gralloc");
}
diff --git a/light/2.0/default/service.cpp b/light/2.0/default/service.cpp
index e446878..b3848e9 100644
--- a/light/2.0/default/service.cpp
+++ b/light/2.0/default/service.cpp
@@ -1,46 +1,27 @@
-#define LOG_TAG "android.hardware.light@2.0-service"
-#include <utils/Log.h>
+/*
+ * Copyright 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
-#include <iostream>
-#include <unistd.h>
+#define LOG_TAG "android.hardware.light@2.0-service"
#include <android/hardware/light/2.0/ILight.h>
+#include <hidl/LegacySupport.h>
-#include <hidl/IServiceManager.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-#include <utils/Errors.h>
-#include <utils/StrongPointer.h>
-
-using android::sp;
-
-// libhwbinder:
-using android::hardware::IPCThreadState;
-using android::hardware::ProcessState;
-
-// Generated HIDL files
using android::hardware::light::V2_0::ILight;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- ALOGI("Service is starting.");
- const char instance[] = "light";
- ALOGI("Retrieving default implementation of instance %s.",
- instance);
-
- android::sp<ILight> service = ILight::getService(instance, true /* getStub */);
-
- if (service.get() == nullptr) {
- ALOGE("ILight::getService returned NULL, exiting");
- return EXIT_FAILURE;
- }
-
- LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");
-
- ALOGI("Registering instance %s.", instance);
- service->registerAsService(instance);
- ALOGI("Ready.");
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
+ return defaultPassthroughServiceImplementation<ILight>("light");
}
diff --git a/memtrack/1.0/default/service.cpp b/memtrack/1.0/default/service.cpp
index 63ac695..f705b15 100644
--- a/memtrack/1.0/default/service.cpp
+++ b/memtrack/1.0/default/service.cpp
@@ -15,37 +15,13 @@
*/
#define LOG_TAG "android.hardware.memtrack@1.0-service"
-#include <utils/Log.h>
-
-#include <iostream>
-#include <unistd.h>
#include <android/hardware/memtrack/1.0/IMemtrack.h>
-
-#include <hidl/IServiceManager.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-#include <utils/Errors.h>
-#include <utils/StrongPointer.h>
-
-using android::sp;
-
-using android::hardware::IPCThreadState;
-using android::hardware::ProcessState;
+#include <hidl/LegacySupport.h>
using android::hardware::memtrack::V1_0::IMemtrack;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- const char instance[] = "memtrack";
- android::sp<IMemtrack> service = IMemtrack::getService(instance, true);
- if (service.get() == nullptr) {
- ALOGE("IMemtrack::getService returned NULL, exiting");
- return -1;
- }
- LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");
- service->registerAsService(instance);
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
+ return defaultPassthroughServiceImplementation<IMemtrack>("memtrack");
}
diff --git a/power/1.0/default/service.cpp b/power/1.0/default/service.cpp
index bad1adf..f77ff5b 100644
--- a/power/1.0/default/service.cpp
+++ b/power/1.0/default/service.cpp
@@ -15,37 +15,13 @@
*/
#define LOG_TAG "android.hardware.power@1.0-service"
-#include <utils/Log.h>
-
-#include <iostream>
-#include <unistd.h>
#include <android/hardware/power/1.0/IPower.h>
-
-#include <hidl/IServiceManager.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-#include <utils/Errors.h>
-#include <utils/StrongPointer.h>
-
-using android::sp;
-
-using android::hardware::IPCThreadState;
-using android::hardware::ProcessState;
+#include <hidl/LegacySupport.h>
using android::hardware::power::V1_0::IPower;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- const char instance[] = "power";
- android::sp<IPower> service = IPower::getService(instance, true);
- if (service.get() == nullptr) {
- ALOGE("IPower::getService returned NULL, exiting");
- return -1;
- }
- LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");
- service->registerAsService(instance);
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
+ return defaultPassthroughServiceImplementation<IPower>("power");
}
diff --git a/sensors/1.0/default/service.cpp b/sensors/1.0/default/service.cpp
index da543ef..230ead3 100644
--- a/sensors/1.0/default/service.cpp
+++ b/sensors/1.0/default/service.cpp
@@ -14,38 +14,14 @@
* limitations under the License.
*/
-#include <android-base/logging.h>
+#define LOG_TAG "android.hardware.nfc@1.0-service"
+
#include <android/hardware/sensors/1.0/ISensors.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
+#include <hidl/LegacySupport.h>
+
+using android::hardware::sensors::V1_0::ISensors;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- using android::hardware::sensors::V1_0::ISensors;
- using android::sp;
- using android::OK;
- using namespace android::hardware;
-
- LOG(INFO) << "Service is starting.";
- sp<ISensors> sensors = ISensors::getService("sensors", true /* getStub */);
-
- if (sensors.get() == nullptr) {
- LOG(ERROR) << "ISensors::getService returned nullptr, exiting.";
- return 1;
- }
-
- LOG(INFO) << "Default implementation using sensors is "
- << (sensors->isRemote() ? "REMOTE" : "LOCAL");
-
- CHECK(!sensors->isRemote());
-
- LOG(INFO) << "Registering instance sensors.";
- sensors->registerAsService("sensors");
- LOG(INFO) << "Ready.";
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
-
- return 0;
+ return defaultPassthroughServiceImplementation<ISensors>("sensors");
}
-
diff --git a/thermal/1.0/default/service.cpp b/thermal/1.0/default/service.cpp
index b09b5ec..ea86de4 100644
--- a/thermal/1.0/default/service.cpp
+++ b/thermal/1.0/default/service.cpp
@@ -14,40 +14,14 @@
* limitations under the License.
*/
-#include <iostream>
-#include <unistd.h>
+#define LOG_TAG "android.hardware.thermal@1.0-service"
#include <android/hardware/thermal/1.0/IThermal.h>
+#include <hidl/LegacySupport.h>
-#include <hidl/IServiceManager.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-#include <utils/Errors.h>
-
-#define LOG_TAG "android.hardware.thermal@1.0-service"
-#include <utils/Log.h>
-#include <utils/StrongPointer.h>
-
-using android::sp;
-
-// libhwbinder:
-using android::hardware::IPCThreadState;
-using android::hardware::ProcessState;
-
-// Generated HIDL files
using android::hardware::thermal::V1_0::IThermal;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- const char instance[] = "thermal";
- sp<IThermal> service = IThermal::getService(instance, true /* getStub */);
- if (service.get() == nullptr) {
- ALOGE("IThermal::getService returned NULL, exiting");
- return EXIT_FAILURE;
- }
- LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");
- service->registerAsService(instance);
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
+ return defaultPassthroughServiceImplementation<IThermal>("thermal");
}
diff --git a/vibrator/1.0/default/service.cpp b/vibrator/1.0/default/service.cpp
index a4a7132..064e1e2 100644
--- a/vibrator/1.0/default/service.cpp
+++ b/vibrator/1.0/default/service.cpp
@@ -14,46 +14,13 @@
* limitations under the License.
*/
#define LOG_TAG "android.hardware.vibrator@1.0-service"
-#include <utils/Log.h>
-
-#include <iostream>
-#include <unistd.h>
#include <android/hardware/vibrator/1.0/IVibrator.h>
+#include <hidl/LegacySupport.h>
-#include <hidl/IServiceManager.h>
-#include <hwbinder/IPCThreadState.h>
-#include <hwbinder/ProcessState.h>
-#include <utils/Errors.h>
-#include <utils/StrongPointer.h>
-
-using android::sp;
-
-// libhwbinder:
-using android::hardware::IPCThreadState;
-using android::hardware::ProcessState;
-
-// Generated HIDL files
using android::hardware::vibrator::V1_0::IVibrator;
+using android::hardware::defaultPassthroughServiceImplementation;
int main() {
- ALOGI("Service is starting.");
- const char instance[] = "vibrator";
- ALOGI("Retrieving default implementation of instance %s.",
- instance);
- android::sp<IVibrator> service = IVibrator::getService(instance, true);
- if (service.get() == nullptr) {
- ALOGE("IVibrator::getService returned NULL, exiting");
- return -1;
- }
- ALOGI("Default implementation using %s is %s",
- instance, (service->isRemote() ? "REMOTE" : "LOCAL"));
- LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");
- ALOGI("Registering instance %s.", instance);
- service->registerAsService(instance);
- ALOGI("Ready.");
-
- ProcessState::self()->setThreadPoolMaxThreadCount(0);
- ProcessState::self()->startThreadPool();
- IPCThreadState::self()->joinThreadPool();
+ return defaultPassthroughServiceImplementation<IVibrator>("vibrator");
}