commit 4c15eccb92a74a043ce9090d5f8426483ece4e5d
author Jaesoo Lee <jaesoo@google.com> Fri May 12 05:16:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 12 05:16:36 2017 +0000
tree b7adc21b70bc767550c77529cdd370eb78050413
parent da36690e9b8a51bd541d28e0c942e6461d7f40d5
parent d21a105380318907823072d95e4a1bc1c118eccc

configstore: include types.h instead of ISurfaceFlingerConfigs.h am: 92c77bd6e7 am: 4b1848247f
am: d21a105380

Change-Id: I1a674bd0827b0dccdb01fded168cf3122de81afa

configstore/utils/include/configstore/Utils.h

diff --git a/configstore/utils/include/configstore/Utils.h b/configstore/utils/include/configstore/Utils.h
index a54ce85..c9c830b 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