commit 92c77bd6e7b942f3f2e3b6d66b2638b14a2f2fc3
author Jaesoo Lee <jaesoo@google.com> Tue May 02 15:15:14 2017 +0900
committer Jaesoo Lee <jaesoo@google.com> Thu May 11 09:37:03 2017 +0900
tree 42f4f132faf92238344aa263eb8d3d4ae4f73291
parent 319b8292be84f757308d90a972595bad08f95c12

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

diff --git a/configstore/utils/include/configstore/Utils.h b/configstore/utils/include/configstore/Utils.h
index b054534..862e812 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 <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
+#include <android/hardware/configstore/1.0/types.h>
 #include <hidl/Status.h>
 
 #include <sstream>
@@ -34,7 +34,14 @@
 }  // 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