Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fcc94d0 authored by David Anderson's avatar David Anderson Committed by Android (Google) Code Review
Browse files

Merge "Fix requests for IBootControl 1.0 when using the 1.1 HAL."

parents ae263736 0ede089f

boot/1.1/default/Android.bp

+5 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "android.hardware.boot@1.1-impl",

    stem: "android.hardware.boot@1.0-impl-1.1",

    defaults: [

        "hidl_defaults",

        "libboot_control_defaults",
@@ -31,6 +32,10 @@ cc_binary { 
    init_rc: ["android.hardware.boot@1.1-service.rc"],

    srcs: ["service.cpp"],



    vintf_fragments: [

        "android.hardware.boot@1.1.xml",

    ],



    shared_libs: [

        "liblog",

        "libhardware",

boot/1.1/default/android.hardware.boot@1.1.xml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

    <hal format="hidl">

        <name>android.hardware.boot</name>

        <transport>hwbinder</transport>

        <fqname>@1.1::IBootControl/default</fqname>

    </hal>

</manifest>

boot/1.1/default/service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
 */

#define LOG_TAG "android.hardware.boot@1.1-service"



#include <android/hardware/boot/1.1/IBootControl.h>

#include <android/hardware/boot/1.0/IBootControl.h>

#include <hidl/LegacySupport.h>



using android::hardware::defaultPassthroughServiceImplementation;

using ::android::hardware::boot::V1_1::IBootControl;

using ::android::hardware::boot::V1_0::IBootControl;



int main(int /* argc */, char* /* argv */[]) {

    return defaultPassthroughServiceImplementation<IBootControl>();