From 9441a1eb984b81b76bd4b58f6511b70513c6219f Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 5 Nov 2019 17:02:51 -0800 Subject: [PATCH] IBootControl: Use new defaultPassthroughServiceImplementation signature. Using the new signature ensures that the device actually provides an IBootControl 1.1 implementation. Bug: N/A Test: manual test Change-Id: I0ddc1ed71535a31c887d94196295baa46ed37d3c --- boot/1.1/default/service.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/1.1/default/service.cpp b/boot/1.1/default/service.cpp index 93eaedab8d..89251b5c92 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 +#include #include 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(); + return defaultPassthroughServiceImplementation(); }