diff options
| author | Andres Morales <anmorales@google.com> | 2015-07-10 18:27:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 18:27:49 +0000 |
| commit | 0e761b8c39470ba10bbb9ab98fe97e0e903baae1 (patch) | |
| tree | 07e268e14d0f84684cb9d9a1d0348c0ff366d66a /gatekeeperd | |
| parent | 5767a723bb6bc61180821d444fd276553293cc9b (diff) | |
| parent | 07f0aef8b98aea677e2f97589a6866903ed540ef (diff) | |
| download | system_core-0e761b8c39470ba10bbb9ab98fe97e0e903baae1.tar.gz system_core-0e761b8c39470ba10bbb9ab98fe97e0e903baae1.tar.bz2 system_core-0e761b8c39470ba10bbb9ab98fe97e0e903baae1.zip | |
am 07f0aef8: am a5c8358a: am 787c3764: Merge "[gatekeeperd] fix use of uninitialized memory" into mnc-dev
* commit '07f0aef8b98aea677e2f97589a6866903ed540ef':
[gatekeeperd] fix use of uninitialized memory
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()); |