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

Commit 7a6d907b authored by Carlos Martinez Romero's avatar Carlos Martinez Romero Committed by Android (Google) Code Review
Browse files

Merge "Deprecate SKIP_VALIDATE."

parents d5e04a33 cd04361b

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

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ enum Capability { 
  SIDEBAND_STREAM = 1,

  SKIP_CLIENT_COLOR_TRANSFORM = 2,

  PRESENT_FENCE_IS_NOT_RELIABLE = 3,

  /**

   * @deprecated - enabled by default.

   */

  SKIP_VALIDATE = 4,

  BOOT_DISPLAY_CONFIG = 5,

  HDR_OUTPUT_CONVERSION_CONFIG = 6,

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

+3 −3
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ parcelable DisplayRequest { 
  long display;

  int mask;

  android.hardware.graphics.composer3.DisplayRequest.LayerRequest[] layerRequests;

  const int FLIP_CLIENT_TARGET = 1;

  const int WRITE_CLIENT_TARGET_TO_OUTPUT = 2;

  const int FLIP_CLIENT_TARGET = (1 << 0);

  const int WRITE_CLIENT_TARGET_TO_OUTPUT = (1 << 1);

  @VintfStability

  parcelable LayerRequest {

    long layer;

    int mask;

    const int CLEAR_CLIENT_TARGET = 1;

    const int CLEAR_CLIENT_TARGET = (1 << 0);

  }

}

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

+4 −4
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
package android.hardware.graphics.composer3;

@Backing(type="byte") @VintfStability

enum FormatColorComponent {

  FORMAT_COMPONENT_0 = 1,

  FORMAT_COMPONENT_1 = 2,

  FORMAT_COMPONENT_2 = 4,

  FORMAT_COMPONENT_3 = 8,

  FORMAT_COMPONENT_0 = (1 << 0),

  FORMAT_COMPONENT_1 = (1 << 1),

  FORMAT_COMPONENT_2 = (1 << 2),

  FORMAT_COMPONENT_3 = (1 << 3),

}

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

+1 −1
Original line number Diff line number Diff line
@@ -88,5 +88,5 @@ interface IComposerClient { 
  const int EX_UNSUPPORTED = 8;

  const int EX_SEAMLESS_NOT_ALLOWED = 9;

  const int EX_SEAMLESS_NOT_POSSIBLE = 10;

  const int INVALID_CONFIGURATION = 2147483647;

  const int INVALID_CONFIGURATION = 0x7fffffff;

}

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

+13 −13
Original line number Diff line number Diff line
@@ -34,17 +34,17 @@ 
package android.hardware.graphics.composer3;

@Backing(type="int") @VintfStability

enum PerFrameMetadataKey {

  DISPLAY_RED_PRIMARY_X = 0,

  DISPLAY_RED_PRIMARY_Y = 1,

  DISPLAY_GREEN_PRIMARY_X = 2,

  DISPLAY_GREEN_PRIMARY_Y = 3,

  DISPLAY_BLUE_PRIMARY_X = 4,

  DISPLAY_BLUE_PRIMARY_Y = 5,

  WHITE_POINT_X = 6,

  WHITE_POINT_Y = 7,

  MAX_LUMINANCE = 8,

  MIN_LUMINANCE = 9,

  MAX_CONTENT_LIGHT_LEVEL = 10,

  MAX_FRAME_AVERAGE_LIGHT_LEVEL = 11,

  HDR10_PLUS_SEI = 12,

  DISPLAY_RED_PRIMARY_X,

  DISPLAY_RED_PRIMARY_Y,

  DISPLAY_GREEN_PRIMARY_X,

  DISPLAY_GREEN_PRIMARY_Y,

  DISPLAY_BLUE_PRIMARY_X,

  DISPLAY_BLUE_PRIMARY_Y,

  WHITE_POINT_X,

  WHITE_POINT_Y,

  MAX_LUMINANCE,

  MIN_LUMINANCE,

  MAX_CONTENT_LIGHT_LEVEL,

  MAX_FRAME_AVERAGE_LIGHT_LEVEL,

  HDR10_PLUS_SEI,

}