commit 4608cec784edcf6f78e733e6db0af5c7297224df
author Thierry Strudel <tstrudel@google.com> Fri Jul 10 18:27:57 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 10 18:28:03 2015 +0000
tree 94c43f6c16275b643900b148169f1ab1d7cf31dd
parent 305549390f29765a7b5a8285716520978acec6ca
parent 60cb6f1ba690e03fef05066ba387f914c98461c8

Merge "fs_config: replace getenv('OUT') by new fs_config parameter" into mnc-dev

gatekeeperd/gatekeeperd.cpp

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 6622df9..9788681 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -50,6 +50,8 @@
 public:
     GateKeeperProxy() {
         int ret = hw_get_module_by_class(GATEKEEPER_HARDWARE_MODULE_ID, NULL, &module);
+        device = NULL;
+
         if (ret < 0) {
             ALOGW("falling back to software GateKeeper");
             soft_device.reset(new SoftGateKeeperDevice());
@@ -112,6 +114,7 @@
         int fd = open(filename, O_RDONLY);
         if (fd < 0) return 0;
         read(fd, &sid, sizeof(sid));
+        close(fd);
         return sid;
     }