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

Commit d1023f25 authored by Michael Hoisie's avatar Michael Hoisie
Browse files

Standardize on base::GetProperty in libgraphicsenv 

GraphicsEnv.cpp used cutils to query some properties and libbase to
query others. Switch all of them to libbase which is compatible with
host.

Test: build, flash device, and open angle settings
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I2f96d88b22f2acea5ba8fbe59add38c90f7ff09e
Bug: 152620031
parent c730aff3

libs/graphicsenv/GraphicsEnv.cpp

+5 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <android-base/strings.h>

#include <android/dlext.h>

#include <binder/IServiceManager.h>

#include <cutils/properties.h>

#include <graphicsenv/IGpuService.h>

#include <log/log.h>

#include <nativeloader/dlext_namespaces.h>
@@ -67,7 +66,7 @@ static constexpr const char* kNativeLibrariesSystemConfigPath[] = 


static std::string vndkVersionStr() {

#ifdef __BIONIC__

    return android::base::GetProperty("ro.vndk.version", "");

    return base::GetProperty("ro.vndk.version", "");

#endif

    return "";

}
@@ -338,10 +337,8 @@ void* GraphicsEnv::loadLibrary(std::string name) { 
}



bool GraphicsEnv::checkAngleRules(void* so) {

    char manufacturer[PROPERTY_VALUE_MAX];

    char model[PROPERTY_VALUE_MAX];

    property_get("ro.product.manufacturer", manufacturer, "UNSET");

    property_get("ro.product.model", model, "UNSET");

    auto manufacturer = base::GetProperty("ro.product.manufacturer", "UNSET");

    auto model = base::GetProperty("ro.product.model", "UNSET");



    auto ANGLEGetFeatureSupportUtilAPIVersion =

            (fpANGLEGetFeatureSupportUtilAPIVersion)dlsym(so,
@@ -394,7 +391,8 @@ bool GraphicsEnv::checkAngleRules(void* so) { 
                ALOGW("ANGLE feature-support library cannot obtain SystemInfo");

                break;

            }

            if (!(ANGLEAddDeviceInfoToSystemInfo)(manufacturer, model, systemInfoHandle)) {

            if (!(ANGLEAddDeviceInfoToSystemInfo)(manufacturer.c_str(), model.c_str(),

                                                  systemInfoHandle)) {

                ALOGW("ANGLE feature-support library cannot add device info to SystemInfo");

                break;

            }