bringup: use std unique ptr instead of UniquePtr [5/12]

PD# 156770

use std unique ptr, otherwise android version update it will have compile issue

Change-Id: Ib4ef5e657f0b4621b2334f76a5fde001ae4039f9

2 files changed, 4 insertions, 4 deletions

diff --git a/soft/SoftGateKeeper.h b/soft/SoftGateKeeper.h
index 972dd24..2f4f4d7 100644
--- a/soft/SoftGateKeeper.h
+++ b/soft/SoftGateKeeper.h
@@ -26,11 +26,11 @@ extern "C" {
 }
 
 #include <android-base/memory.h>
-#include <UniquePtr.h>
 #include <gatekeeper/gatekeeper.h>
 
 #include <iostream>
 #include <unordered_map>
+#include <memory>
 
 namespace gatekeeper {
 
@@ -105,7 +105,7 @@ public:
     }
 
     virtual bool IsHardwareBacked() const {
-        return true;
+        return false;
     }
 
     virtual bool GetFailureRecord(uint32_t uid, secure_id_t user_id, failure_record_t *record,
@@ -173,7 +173,7 @@ private:
     typedef std::unordered_map<uint32_t, failure_record_t> FailureRecordMap;
     typedef std::unordered_map<uint64_t, fast_hash_t> FastHashMap;
 
-    UniquePtr<uint8_t[]> key_;
+    std::unique_ptr<uint8_t[]> key_;
     FailureRecordMap failure_map_;
     FastHashMap fast_hash_map_;
 };
diff --git a/soft/SoftGateKeeperDevice.h b/soft/SoftGateKeeperDevice.h
index ae71b8c..342879c 100644
--- a/soft/SoftGateKeeperDevice.h
+++ b/soft/SoftGateKeeperDevice.h
@@ -85,7 +85,7 @@ public:
 
     gatekeeper_device deviceSoft;
 private:
-    UniquePtr<SoftGateKeeper> implSoft;
+    std::unique_ptr<SoftGateKeeper> implSoft;
 };
 
 } // namespace gatekeeper