ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "gatekeeperd: use std::unique_ptr"

Browse source
This commit is contained in:
Jae Shin 2017-09-15 07:00:07 +00:00 • committed by Gerrit Code Review
commit 0dd4b6aa39
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gatekeeperd/SoftGateKeeper.h
View file

@ -27,10 +27,10 @@ extern "C" {
#include <android-base/memory.h> #include <android-base/memory.h>
#include <gatekeeper/gatekeeper.h> #include <gatekeeper/gatekeeper.h>
#include <nativehelper/UniquePtr.h>
#include <iostream> #include <iostream>
#include <unordered_map> #include <unordered_map>
#include <memory>
namespace gatekeeper { namespace gatekeeper {
@ -173,7 +173,7 @@ private:
typedef std::unordered_map<uint32_t, failure_record_t> FailureRecordMap; typedef std::unordered_map<uint32_t, failure_record_t> FailureRecordMap;
typedef std::unordered_map<uint64_t, fast_hash_t> FastHashMap; typedef std::unordered_map<uint64_t, fast_hash_t> FastHashMap;
UniquePtr<uint8_t[]> key_; std::unique_ptr<uint8_t[]> key_;
FailureRecordMap failure_map_; FailureRecordMap failure_map_;
FastHashMap fast_hash_map_; FastHashMap fast_hash_map_;
}; };

4
gatekeeperd/SoftGateKeeperDevice.h
View file

@ -19,7 +19,7 @@
#include "SoftGateKeeper.h" #include "SoftGateKeeper.h"
#include <nativehelper/UniquePtr.h> #include <memory>
using namespace gatekeeper; using namespace gatekeeper;
@ -68,7 +68,7 @@ public:
const uint8_t *provided_password, uint32_t provided_password_length, const uint8_t *provided_password, uint32_t provided_password_length,
uint8_t **auth_token, uint32_t *auth_token_length, bool *request_reenroll); uint8_t **auth_token, uint32_t *auth_token_length, bool *request_reenroll);
private: private:
UniquePtr<SoftGateKeeper> impl_; std::unique_ptr<SoftGateKeeper> impl_;
}; };
} // namespace gatekeeper } // namespace gatekeeper

3
gatekeeperd/gatekeeperd.cpp
View file

@ -23,6 +23,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <memory>
#include <binder/IPCThreadState.h> #include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
@ -375,7 +376,7 @@ public:
private: private:
sp<IGatekeeper> hw_device; sp<IGatekeeper> hw_device;
UniquePtr<SoftGateKeeperDevice> soft_device; std::unique_ptr<SoftGateKeeperDevice> soft_device;
}; };
}// namespace android }// namespace android

1
gatekeeperd/tests/gatekeeper_test.cpp
View file

@ -19,7 +19,6 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <hardware/hw_auth_token.h> #include <hardware/hw_auth_token.h>
#include <nativehelper/UniquePtr.h>
#include "../SoftGateKeeper.h" #include "../SoftGateKeeper.h"