summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-02-05 17:06:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-02-05 17:06:12 +0000
commit8a0cd8fd47e382f6385339f548ec1ef153e40c3a (patch)
tree6938741690c8a69e865eed2bfccb0df6e27d8f38
parentdf0c9d93083e99d9cc2c92f740c80ad0dcc0d5c7 (diff)
parentcf673688268f255b5a5000b4735ea9965cde9c33 (diff)
Merge "GpuStats: remove set_property from unittest"
-rw-r--r--services/gpuservice/tests/unittests/GpuStatsTest.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/services/gpuservice/tests/unittests/GpuStatsTest.cpp b/services/gpuservice/tests/unittests/GpuStatsTest.cpp
index 276a3341d7..f038c8afda 100644
--- a/services/gpuservice/tests/unittests/GpuStatsTest.cpp
+++ b/services/gpuservice/tests/unittests/GpuStatsTest.cpp
@@ -39,8 +39,6 @@ using testing::HasSubstr;
#define UPDATED_DRIVER_VER_CODE 1
#define UPDATED_DRIVER_BUILD_TIME 234
#define VULKAN_VERSION 345
-#define CPU_VULKAN_VERSION 456
-#define OPENGLES_VERSION 567
#define APP_PKG_NAME_1 "testapp1"
#define APP_PKG_NAME_2 "testapp2"
#define DRIVER_LOADING_TIME_1 678
@@ -74,10 +72,8 @@ public:
std::string inputCommand(InputCommand cmd);
void SetUp() override {
- property_set("ro.cpuvulkan.version", std::to_string(CPU_VULKAN_VERSION).c_str());
- property_set("ro.opengles.version", std::to_string(OPENGLES_VERSION).c_str());
- mCpuVulkanVersion = property_get_int32("ro.cpuvulkan.version", CPU_VULKAN_VERSION);
- mGlesVersion = property_get_int32("ro.opengles.version", OPENGLES_VERSION);
+ mCpuVulkanVersion = property_get_int32("ro.cpuvulkan.version", 0);
+ mGlesVersion = property_get_int32("ro.opengles.version", 0);
}
std::unique_ptr<GpuStats> mGpuStats = std::make_unique<GpuStats>();