Merge "Change to use new WaitForProperty API"
diff --git a/Keymaster.cpp b/Keymaster.cpp
index 1e1ce66..8d1a01b 100644
--- a/Keymaster.cpp
+++ b/Keymaster.cpp
@@ -94,7 +94,7 @@
 }
 
 Keymaster::Keymaster() {
-    mDevice = ::android::hardware::keymaster::V3_0::IKeymasterDevice::getService("keymaster");
+    mDevice = ::android::hardware::keymaster::V3_0::IKeymasterDevice::getService();
 }
 
 bool Keymaster::generateKey(const AuthorizationSet& inParams, std::string* key) {