commit fdf32f00fa2b72a6aaf1acf57b0d67d970d5858c
author David Anderson <dvander@google.com> Wed Nov 06 10:21:17 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 06 10:21:17 2019 -0800
tree 62c77132e00768884a26e56f172f0e961a1a7d7e
parent 8bbb6bc175a7761f805b9a2d0eccf24814280e12
parent decc075e5fcce38f3e3198613480bc575bf28f50

Merge "IBootControl: Use new defaultPassthroughServiceImplementation signature." am: 240c726150 am: b1ec4c6aa1
am: decc075e5f

Change-Id: I14c96f8da4c6bdff019809cf926fe24ec84512ed

boot/1.1/default/service.cpp

diff --git a/boot/1.1/default/service.cpp b/boot/1.1/default/service.cpp
index 93eaeda..89251b5 100644
--- a/boot/1.1/default/service.cpp
+++ b/boot/1.1/default/service.cpp
@@ -15,12 +15,13 @@
  */
 #define LOG_TAG "android.hardware.boot@1.1-service"
 
-#include <android/hardware/boot/1.0/IBootControl.h>
+#include <android/hardware/boot/1.1/IBootControl.h>
 #include <hidl/LegacySupport.h>
 
 using android::hardware::defaultPassthroughServiceImplementation;
-using ::android::hardware::boot::V1_0::IBootControl;
+using IBootControl_V1_0 = android::hardware::boot::V1_0::IBootControl;
+using IBootControl_V1_1 = android::hardware::boot::V1_1::IBootControl;
 
 int main(int /* argc */, char* /* argv */[]) {
-    return defaultPassthroughServiceImplementation<IBootControl>();
+    return defaultPassthroughServiceImplementation<IBootControl_V1_0, IBootControl_V1_1>();
 }