resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master (0ed84e3e) · Commits · e / os / android_system_core

gatekeeperd/SoftGateKeeper.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,10 +27,10 @@ extern "C" {

		#include <android-base/memory.h>
		#include <gatekeeper/gatekeeper.h>
		#include <nativehelper/UniquePtr.h>

		#include <iostream>
		#include <unordered_map>
		#include <memory>

		namespace gatekeeper {

		@@ -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_;
		};

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@

		#include "SoftGateKeeper.h"

		#include <nativehelper/UniquePtr.h>
		#include <memory>

		using namespace gatekeeper;

		@@ -68,7 +68,7 @@ public:
		const uint8_t *provided_password, uint32_t provided_password_length,
		uint8_t *auth_token, uint32_t auth_token_length, bool *request_reenroll);
		private:
		UniquePtr<SoftGateKeeper> impl_;
		std::unique_ptr<SoftGateKeeper> impl_;
		};

		} // namespace gatekeeper

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <inttypes.h>
		#include <stdint.h>
		#include <unistd.h>
		#include <memory>

		#include <binder/IPCThreadState.h>
		#include <binder/IServiceManager.h>
		@@ -400,7 +401,7 @@ public:

		private:
		sp<IGatekeeper> hw_device;
		UniquePtr<SoftGateKeeperDevice> soft_device;
		std::unique_ptr<SoftGateKeeperDevice> soft_device;

		bool clear_state_if_needed_done;
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@

		#include <gtest/gtest.h>
		#include <hardware/hw_auth_token.h>
		#include <nativehelper/UniquePtr.h>

		#include "../SoftGateKeeper.h"