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

Commit d40b5667 authored by ramindani's avatar ramindani
Browse files

[Composer-HAL-AIDL] Interface changes with getDisplayConfigurations 

Updates to the AIDL interfaces with getDisplayConfigurations
This will be replacing the getDisplayConfig api that will be deprecated in the upcoming CL's.
implementations will follow in the upcoming CL's

Test: device boots, atest libsurfacerflinger_unittest, atest VtsHalGraphicsComposer3_TargetTest
BUG: 284866749
BUG: 287517352
Change-Id: I2b64dcaace26a297f308e8f5c2568c35c9cd38cb
parent 37e8951a

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;

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

0 → 100644
+63 −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.

 */



package android.hardware.graphics.composer3;



@VintfStability

parcelable DisplayConfiguration {

    /**

     * The config id, to be used with IComposerClient.setActiveConfig.

     */

    int configId;



    /**

     * Dimensions in pixels

     */

    int width;

    int height;



    /**

     * Dots per thousand inches.

     * If the DPI for a configuration is unavailable or is

     * considered unreliable, the device may set null instead.

     */

    parcelable Dpi {

        float x;

        float y;

    }

    @nullable Dpi dpi;



    /**

     * The configuration group ID this config is associated to.

     * Switching between configurations within the same group may be

     * done seamlessly in some conditions via

     * setActiveConfigWithConstraints. Configurations which share the

     * same config group are similar in all attributes except for the

     * vsync period.

     */

    int configGroup;



    /**

     * Vsync period in nanoseconds. This period represents the internal

     * frequency of the display. IComposerCallback.onVsync is expected

     * to be called on each vsync event. For non-VRR configurations, a

     * frame can be presented on each vsync event.

     *

     * A present fence, retrieved from CommandResultPayload.presentFence

     * must be signaled on a vsync boundary.

     */

    int vsyncPeriod;

}

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

+17 −8
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.hardware.graphics.composer3.ContentType; 
import android.hardware.graphics.composer3.DisplayAttribute;

import android.hardware.graphics.composer3.DisplayCapability;

import android.hardware.graphics.composer3.DisplayCommand;

import android.hardware.graphics.composer3.DisplayConfiguration;

import android.hardware.graphics.composer3.DisplayConnectionType;

import android.hardware.graphics.composer3.DisplayContentSample;

import android.hardware.graphics.composer3.DisplayContentSamplingAttributes;
@@ -263,15 +264,12 @@ interface IComposerClient { 
    DisplayCapability[] getDisplayCapabilities(long display);



    /**

     * Returns handles for all of the valid display configurations on this

     * display.

     * This should never return INVALID_CONFIGURATION as a valid value.

     *

     * @param display is the display to query.

     * @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.

     *

     * @return is an array of configuration handles.

     *

     * @exception EX_BAD_DISPLAY when an invalid display handle was passed in.

     * @see getDisplayConfigurations

     */

    int[] getDisplayConfigs(long display);
@@ -864,4 +862,15 @@ interface IComposerClient { 
     *        false when refresh rate callback is disabled.

     */

    void setRefreshRateChangedCallbackDebugEnabled(long display, boolean enabled);



    /**

     * Returns all of the valid display configurations.

     * getDisplayConfigurations is the superset of getDisplayConfigs and

     * getDisplayConfigs should return at least one config.

     *

     * @param display is the display for which the configurations are requested.

     *

     * @see getDisplayConfigs

     */

    DisplayConfiguration[] getDisplayConfigurations(long display);

}