From 92c77bd6e7b942f3f2e3b6d66b2638b14a2f2fc3 Mon Sep 17 00:00:00 2001 From: Jaesoo Lee Date: Tue, 2 May 2017 15:15:14 +0900 Subject: [PATCH] configstore: include types.h instead of ISurfaceFlingerConfigs.h Utils.h does not need to include ISurfaceFlingerConfigs.h. Bug: 37727469 Test: successfully built sailfish-userdebug Change-Id: I6650020bfc3b265d871ca3244b8900c336f98419 --- configstore/utils/include/configstore/Utils.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configstore/utils/include/configstore/Utils.h b/configstore/utils/include/configstore/Utils.h index b054534194..862e81212e 100644 --- a/configstore/utils/include/configstore/Utils.h +++ b/configstore/utils/include/configstore/Utils.h @@ -17,7 +17,7 @@ #ifndef ANDROID_HARDWARE_CONFIGSTORE_UTILS_H #define ANDROID_HARDWARE_CONFIGSTORE_UTILS_H -#include +#include #include #include @@ -34,7 +34,14 @@ void logAlwaysError(const std::string& message); } // namespace details namespace configstore { -using namespace android::hardware::configstore::V1_0; +// import types from V1_0 +using ::android::hardware::configstore::V1_0::OptionalBool; +using ::android::hardware::configstore::V1_0::OptionalInt32; +using ::android::hardware::configstore::V1_0::OptionalUInt32; +using ::android::hardware::configstore::V1_0::OptionalInt64; +using ::android::hardware::configstore::V1_0::OptionalUInt64; +using ::android::hardware::configstore::V1_0::OptionalString; + // arguments V: type for the value (i.e., OptionalXXX) // I: interface class name // func: member function pointer