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

Commit 0e8d4711 authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Add SYSUI session tag and update PowerHAL version" into main

parents 4b144301 456df70e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@
    </hal>
    <hal format="aidl">
        <name>android.hardware.power</name>
        <version>5</version>
        <version>5-6</version>
        <interface>
            <name>IPower</name>
            <instance>default</instance>
+16 −9
Original line number Diff line number Diff line
@@ -69,46 +69,53 @@ aidl_interface {
                "android.hardware.common-V2",
            ],
        },

    ],
    frozen: true,

    frozen: false,
}

power_version = "android.hardware.power-V6"

cc_defaults {
    name: "android.hardware.power-ndk_shared",
    shared_libs: [
        "android.hardware.power-V5-ndk",
        power_version + "-ndk",
    ],
}

cc_defaults {
    name: "android.hardware.power-ndk_export_shared",
    shared_libs: [
        "android.hardware.power-V5-ndk",
        power_version + "-ndk",
    ],
    export_shared_lib_headers: [
        "android.hardware.power-V5-ndk",
        power_version + "-ndk",
    ],
}

cc_defaults {
    name: "android.hardware.power-ndk_static",
    static_libs: [
        "android.hardware.power-V5-ndk",
        power_version + "-ndk",
    ],
}

java_defaults {
    name: "android.hardware.power-java_shared",
    libs: [
        "android.hardware.power-V5-java",
        power_version + "-java",
    ],
}

java_defaults {
    name: "android.hardware.power-java_static",
    static_libs: [
        "android.hardware.power-V5-java",
        power_version + "-java",
    ],
}

aidl_interface_defaults {
    name: "android.hardware.power-aidl",
    imports: [
        power_version,
    ],
}
+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ enum SessionTag {
  HWUI,
  GAME,
  APP,
  SYSUI,
}
+5 −0
Original line number Diff line number Diff line
@@ -46,4 +46,9 @@ enum SessionTag {
     * instead.
     */
    APP,

    /**
     * This tag is used to mark hint sessions created by the system UI.
     */
    SYSUI,
}
+1 −1
Original line number Diff line number Diff line
<manifest version="1.0" type="device">
    <hal format="aidl">
        <name>android.hardware.power</name>
        <version>5</version>
        <version>6</version>
        <fqname>IPower/default</fqname>
    </hal>
</manifest>