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

Commit 198c5c6d authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Add a new api to support HDCP" into main

parents 57dac1f9 3a42a8a0

drm/common/aidl/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ package { 


aidl_interface {

    name: "android.hardware.drm.common",

    host_supported: true,

    vendor_available: true,

    srcs: ["android/hardware/drm/*.aidl"],

    stability: "vintf",
@@ -22,6 +23,9 @@ aidl_interface { 
        ndk: {

            min_sdk_version: "34",

        },

        rust: {

            enabled: true,

        },

    },

    double_loadable: true,

    versions_with_info: [

graphics/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ cc_defaults { 
cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_static",

    static_libs: [

        "android.hardware.drm.common-V1-ndk",

        "android.hardware.graphics.composer3-V4-ndk",

    ],

}
@@ -60,6 +61,7 @@ cc_defaults { 
cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_shared",

    shared_libs: [

        "android.hardware.drm.common-V1-ndk",

        "android.hardware.graphics.composer3-V4-ndk",

    ],

}

graphics/composer/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ aidl_interface { 
    imports: [

        "android.hardware.graphics.common-V5",

        "android.hardware.common-V2",

        "android.hardware.drm.common-V1",

    ],

    backend: {

        cpp: {

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/IComposerCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ interface IComposerCallback { 
  oneway void onVsyncIdle(long display);

  oneway void onRefreshRateChangedDebug(in android.hardware.graphics.composer3.RefreshRateChangedDebugData data);

  void onHotplugEvent(long display, android.hardware.graphics.common.DisplayHotplugEvent event);

  oneway void onHdcpLevelsChanged(long display, in android.hardware.drm.HdcpLevels levels);

}

graphics/composer/aidl/android/hardware/graphics/composer3/IComposerCallback.aidl

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware.graphics.composer3;



import android.hardware.drm.HdcpLevels;

import android.hardware.graphics.common.DisplayHotplugEvent;

import android.hardware.graphics.composer3.RefreshRateChangedDebugData;

import android.hardware.graphics.composer3.VsyncPeriodChangeTimeline;
@@ -139,4 +140,12 @@ interface IComposerCallback { 
     * @param event is the type of event that occurred.

     */

    void onHotplugEvent(long display, DisplayHotplugEvent event);



    /**

     * Notify the client the HDCP levels of the display changed.

     *

     * @param display is the display whose HDCP levels have changed.

     * @param levels is the new HDCP levels.

     */

    oneway void onHdcpLevelsChanged(long display, in HdcpLevels levels);

}