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

Commit 4a97f080 authored by Ram Indani's avatar Ram Indani Committed by Android (Google) Code Review
Browse files

Merge changes from topic "HWC3-V3" into main 

* changes:
  [Composer VTS] Adds VTS for getDisplayConfigurations
  Upgrade Composer interface version
  [Composer-HAL-AIDL] Interface changes with getDisplayConfigurations
parents 23613609 02fe4772

compatibility_matrices/compatibility_matrix.9.xml

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.graphics.composer3</name>

        <version>2</version>

        <version>3</version>

        <interface>

            <name>IComposer</name>

            <instance>default</instance>

graphics/Android.bp

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

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

    static_libs: [

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

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

    ],

}



cc_defaults {

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

    shared_libs: [

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

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

    ],

}

graphics/composer/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ aidl_interface { 
        enabled: true,

        support_system_process: true,

    },

    frozen: true,

    frozen: false,

    vndk_use_version: "1",

    srcs: [

        "android/hardware/graphics/composer3/*.aidl",

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

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

 * Copyright 2023, 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 DisplayConfiguration {

  int configId;

  int width;

  int height;

  @nullable android.hardware.graphics.composer3.DisplayConfiguration.Dpi dpi;

  int configGroup;

  int vsyncPeriod;

  parcelable Dpi {

    float x;

    float y;

  }

}

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

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ interface IComposerClient { 
  float[] getDataspaceSaturationMatrix(android.hardware.graphics.common.Dataspace dataspace);

  int getDisplayAttribute(long display, int config, android.hardware.graphics.composer3.DisplayAttribute attribute);

  android.hardware.graphics.composer3.DisplayCapability[] getDisplayCapabilities(long display);

  /**

   * @deprecated use getDisplayConfigurations instead. For legacy support getDisplayConfigs should return at least one valid config. All the configs returned from the getDisplayConfigs should also be returned from getDisplayConfigurations.

   */

  int[] getDisplayConfigs(long display);

  android.hardware.graphics.composer3.DisplayConnectionType getDisplayConnectionType(long display);

  android.hardware.graphics.composer3.DisplayIdentification getDisplayIdentificationData(long display);
@@ -79,6 +82,7 @@ interface IComposerClient { 
  android.hardware.graphics.common.HdrConversionCapability[] getHdrConversionCapabilities();

  android.hardware.graphics.common.Hdr setHdrConversionStrategy(in android.hardware.graphics.common.HdrConversionStrategy conversionStrategy);

  void setRefreshRateChangedCallbackDebugEnabled(long display, boolean enabled);

  android.hardware.graphics.composer3.DisplayConfiguration[] getDisplayConfigurations(long display);

  const int EX_BAD_CONFIG = 1;

  const int EX_BAD_DISPLAY = 2;

  const int EX_BAD_LAYER = 3;