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

Commit 80a71901 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Allow AIDL allocator service to be used by itself" into tm-dev am: 617bcfef am: e86bf936 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17725649



Change-Id: I7922046daa497a3d8b80396532fdf5330fa01024
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 054aba8a e86bf936

libs/ui/Gralloc4.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1193,10 +1193,6 @@ std::string Gralloc4Mapper::dumpBuffers(bool less) const { 


Gralloc4Allocator::Gralloc4Allocator(const Gralloc4Mapper& mapper) : mMapper(mapper) {

    mAllocator = IAllocator::getService();

    if (mAllocator == nullptr) {

        ALOGW("allocator 4.x is not supported");

        return;

    }

    if (__builtin_available(android 31, *)) {

        if (hasIAllocatorAidl()) {

            mAidlAllocator = AidlIAllocator::fromBinder(ndk::SpAIBinder(
@@ -1204,10 +1200,14 @@ Gralloc4Allocator::Gralloc4Allocator(const Gralloc4Mapper& mapper) : mMapper(map 
            ALOGE_IF(!mAidlAllocator, "AIDL IAllocator declared but failed to get service");

        }

    }

    if (mAllocator == nullptr && mAidlAllocator == nullptr) {

        ALOGW("allocator 4.x is not supported");

        return;

    }

}



bool Gralloc4Allocator::isLoaded() const {

    return mAllocator != nullptr;

    return mAllocator != nullptr || mAidlAllocator != nullptr;

}



std::string Gralloc4Allocator::dumpDebugInfo(bool less) const {