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

Commit a1150a79 authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Add getOverlaySupport() AIDL interface." am: 433ed5f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19641198



Change-Id: Ic91b7d926140a844b7826fe014d7198b6399a5e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0e23c51 433ed5f2

graphics/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ cc_defaults { 
cc_defaults {

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

    static_libs: [

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

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

    ],

}



cc_defaults {

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

    shared_libs: [

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

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

    ],

}

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

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ interface IComposerClient { 
  void setReadbackBuffer(long display, in android.hardware.common.NativeHandle buffer, in @nullable ParcelFileDescriptor releaseFence);

  void setVsyncEnabled(long display, boolean enabled);

  void setIdleTimerEnabled(long display, int timeoutMs);

  android.hardware.graphics.composer3.OverlayProperties getOverlaySupport();

  const int EX_BAD_CONFIG = 1;

  const int EX_BAD_DISPLAY = 2;

  const int EX_BAD_LAYER = 3;

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

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.graphics.composer3;

@VintfStability

parcelable OverlayProperties {

  android.hardware.graphics.composer3.SupportedBufferCombinations[] combinations;

}

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.graphics.composer3;

@VintfStability

parcelable SupportedBufferCombinations {

  android.hardware.graphics.common.PixelFormat[] pixelFormats;

  android.hardware.graphics.common.Dataspace[] dataspaces;

}

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

+11 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.hardware.graphics.composer3.DisplayIdentification; 
import android.hardware.graphics.composer3.FormatColorComponent;

import android.hardware.graphics.composer3.HdrCapabilities;

import android.hardware.graphics.composer3.IComposerCallback;

import android.hardware.graphics.composer3.OverlayProperties;

import android.hardware.graphics.composer3.PerFrameMetadataKey;

import android.hardware.graphics.composer3.PowerMode;

import android.hardware.graphics.composer3.ReadbackBufferAttributes;
@@ -814,4 +815,14 @@ interface IComposerClient { 
     *

     */

    void setIdleTimerEnabled(long display, int timeoutMs);



    /**

     * Hardware overlays is a technique to composite different buffers directly to the screen

     * while bypassing GPU composition.

     *

     * This function returns what the device's overlays support.

     *

     * @return the overlay properties of the device.

     */

    OverlayProperties getOverlaySupport();

}