diff options
| author | Andres Morales <anmorales@google.com> | 2015-07-10 17:20:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-10 17:20:31 +0000 |
| commit | 787c3764d305168e927c29d5d57ae68e242cd7a9 (patch) | |
| tree | e8fef8c7066e51646c8cefea420b83eb4b653442 /gatekeeperd | |
| parent | 0b0435ea87f87b31652a2c6272c1f77438bfcdf1 (diff) | |
| parent | fef908e5a50a4026bb94edabb8f500a959b9ed0e (diff) | |
| download | system_core-787c3764d305168e927c29d5d57ae68e242cd7a9.tar.gz system_core-787c3764d305168e927c29d5d57ae68e242cd7a9.tar.bz2 system_core-787c3764d305168e927c29d5d57ae68e242cd7a9.zip | |
Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
Diffstat (limited to 'gatekeeperd')
| -rw-r--r-- | gatekeeperd/gatekeeperd.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index cd6d18fc9..978868196 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp @@ -50,6 +50,8 @@ class GateKeeperProxy : public BnGateKeeperService { 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()); |