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

Commit 394cdfbb authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Clarify deprecation message" am: fb373b06 

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



Change-Id: I9a75cbd198f14b0a9309bab3b3d1c29c0d9d1f51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 034335e7 fb373b06

graphics/allocator/aidl/aidl_api/android.hardware.graphics.allocator/current/android/hardware/graphics/allocator/AllocationError.aidl

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.graphics.allocator;

@Backing(type="int") @VintfStability

enum AllocationError {

  BAD_DESCRIPTOR = 0,

  NO_RESOURCES = 1,

  UNSUPPORTED = 2,

  BAD_DESCRIPTOR,

  NO_RESOURCES,

  UNSUPPORTED,

}

graphics/allocator/aidl/aidl_api/android.hardware.graphics.allocator/current/android/hardware/graphics/allocator/IAllocator.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ package android.hardware.graphics.allocator; 
@VintfStability

interface IAllocator {

  /**

   * @deprecated As of android.hardware.graphics.allocator-V2, this is deprecated & replaced with allocate2

   * @deprecated As of android.hardware.graphics.allocator-V2 in combination with AIMAPPER_VERSION_5 this is deprecated & replaced with allocate2. If android.hardware.graphics.mapper@4 is still in use, however, this is still required to be implemented.

   */

  android.hardware.graphics.allocator.AllocationResult allocate(in byte[] descriptor, in int count);

  android.hardware.graphics.allocator.AllocationResult allocate2(in android.hardware.graphics.allocator.BufferDescriptorInfo descriptor, in int count);

graphics/allocator/aidl/android/hardware/graphics/allocator/IAllocator.aidl

+4 −2
Original line number Diff line number Diff line
@@ -32,8 +32,10 @@ interface IAllocator { 
     * @param count The number of buffers to allocate.

     * @return An AllocationResult containing the result of the allocation

     * @throws AllocationError on failure

     * @deprecated As of android.hardware.graphics.allocator-V2, this is deprecated & replaced with

     *         allocate2

     * @deprecated As of android.hardware.graphics.allocator-V2 in combination with

     *             AIMAPPER_VERSION_5 this is deprecated & replaced with allocate2.

     *             If android.hardware.graphics.mapper@4 is still in use, however, this is

     *             still required to be implemented.

     */

    AllocationResult allocate(in byte[] descriptor, in int count);