(factory-2305.B) Integrate system_api CLs into the factory branch
BUG=chrome-os-partner:9874
TEST=None
cherry picked from commit 11f814780a4a8c39b958d126a8f2f5d6101e334d
cherry picked from commit d0462feaf43a86d7696959ebcd00181e3262c735
Change-Id: I8261cdc9e61c185dd565b6da894daf888db019e7
Reviewed-on: https://gerrit.chromium.org/gerrit/24100
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Jay Kim <yongjaek@chromium.org>
diff --git a/dbus/service_constants.h b/dbus/service_constants.h
index 8d9f883..c053358 100644
--- a/dbus/service_constants.h
+++ b/dbus/service_constants.h
@@ -630,6 +630,8 @@
const char kPortalCheckIntervalProperty[] = "PortalCheckInterval";
// Service property names.
+const char kEapRemoteCertificationProperty[] = "EAP.RemoteCertification";
+const char kEapSubjectMatchProperty[] = "EAP.SubjectMatch";
const char kHTTPProxyPortProperty[] = "HTTPProxyPort";
const char kIPConfigProperty[] = "IPConfig";
const char kPhysicalTechnologyProperty[] = "PhysicalTechnology";
@@ -701,6 +703,15 @@
const char kEAPAnonymousIdentity[] = "EAPAnonymousIdentity";
const char kEAPUserIdentity[] = "EAPUserIdentity";
const char kEAPUserPassword[] = "EAPUserPassword";
+
+enum DeviceStatus {
+ kDeviceStatusUninitialized,
+ kDeviceStatusDisabled,
+ kDeviceStatusReady,
+ kDeviceStatusScanning,
+ kDeviceStatusConnecting,
+ kDeviceStatusConnected
+};
} // namespace wimax_manager
namespace bluetooth_common {
