Merge cherrypicks of ['googleplex-android-review.googlesource.com/25841016'] into 24Q1-release.android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I9f8b6c783ae7492366112d8b57e297ef59aa7d1c

1 files changed, 0 insertions, 11 deletions

diff --git a/gralloc4/src/aidl/GrallocAllocator.h b/gralloc4/src/aidl/GrallocAllocator.h
index 91655a7..dadd4b9 100644
--- a/gralloc4/src/aidl/GrallocAllocator.h
+++ b/gralloc4/src/aidl/GrallocAllocator.h
@@ -2,11 +2,9 @@
 
 #include <aidl/android/hardware/graphics/allocator/AllocationResult.h>
 #include <aidl/android/hardware/graphics/allocator/BnAllocator.h>
-#include <aidl/android/hardware/graphics/allocator/BufferDescriptorInfo.h>
 #include <aidlcommonsupport/NativeHandle.h>
 
 #include <cstdint>
-#include <string>
 #include <vector>
 
 namespace pixel {
@@ -23,15 +21,6 @@ public:
     virtual ndk::ScopedAStatus allocate(const std::vector<uint8_t>& descriptor, int32_t count,
                                         AidlAllocator::AllocationResult* result) override;
 
-    virtual ndk::ScopedAStatus allocate2(const AidlAllocator::BufferDescriptorInfo& descriptor,
-                                         int32_t count,
-                                         AidlAllocator::AllocationResult* result) override;
-
-    virtual ndk::ScopedAStatus isSupported(const AidlAllocator::BufferDescriptorInfo& descriptor,
-                                           bool* result) override;
-
-    virtual ndk::ScopedAStatus getIMapperLibrarySuffix(std::string* result) override;
-
     virtual binder_status_t dump(int fd, const char** args, uint32_t numArgs) override;
 };