Merge "idmap2: use 'override' where possible" (b2840bd6) · Commits · e / os / android_frameworks_base

cmds/idmap2/idmap2d/Idmap2Service.h

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -34,18 +34,19 @@ class Idmap2Service : public BinderService<Idmap2Service>, public BnIdmap2 {
	}		}

	binder::Status getIdmapPath(const std::string& overlay_apk_path, int32_t user_id,		binder::Status getIdmapPath(const std::string& overlay_apk_path, int32_t user_id,
	std::string* _aidl_return);		std::string* _aidl_return) override;

	binder::Status removeIdmap(const std::string& overlay_apk_path, int32_t user_id,		binder::Status removeIdmap(const std::string& overlay_apk_path, int32_t user_id,
	bool* _aidl_return);		bool* _aidl_return) override;

	binder::Status verifyIdmap(const std::string& overlay_apk_path, int32_t fulfilled_policies,		binder::Status verifyIdmap(const std::string& overlay_apk_path, int32_t fulfilled_policies,
	bool enforce_overlayable, int32_t user_id, bool* _aidl_return);		bool enforce_overlayable, int32_t user_id,
			bool* _aidl_return) override;

	binder::Status createIdmap(const std::string& target_apk_path,		binder::Status createIdmap(const std::string& target_apk_path,
	const std::string& overlay_apk_path, int32_t fulfilled_policies,		const std::string& overlay_apk_path, int32_t fulfilled_policies,
	bool enforce_overlayable, int32_t user_id,		bool enforce_overlayable, int32_t user_id,
	std::unique_ptr<std::string>* _aidl_return);		std::unique_ptr<std::string>* _aidl_return) override;
	};		};

	} // namespace android::os		} // namespace android::os

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,11 +29,12 @@ class BinaryStreamVisitor : public Visitor {
	public:		public:
	explicit BinaryStreamVisitor(std::ostream& stream) : stream_(stream) {		explicit BinaryStreamVisitor(std::ostream& stream) : stream_(stream) {
	}		}
	virtual void visit(const Idmap& idmap);		~BinaryStreamVisitor() override = default;
	virtual void visit(const IdmapHeader& header);		void visit(const Idmap& idmap) override;
	virtual void visit(const IdmapData& data);		void visit(const IdmapHeader& header) override;
	virtual void visit(const IdmapData::Header& header);		void visit(const IdmapData& data) override;
	virtual void visit(const IdmapData::TypeEntry& type_entry);		void visit(const IdmapData::Header& header) override;
			void visit(const IdmapData::TypeEntry& type_entry) override;

	private:		private:
	void Write16(uint16_t value);		void Write16(uint16_t value);

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -33,11 +33,12 @@ class PrettyPrintVisitor : public Visitor {
	public:		public:
	explicit PrettyPrintVisitor(std::ostream& stream) : stream_(stream) {		explicit PrettyPrintVisitor(std::ostream& stream) : stream_(stream) {
	}		}
	virtual void visit(const Idmap& idmap);		~PrettyPrintVisitor() override = default;
	virtual void visit(const IdmapHeader& header);		void visit(const Idmap& idmap) override;
	virtual void visit(const IdmapData& data);		void visit(const IdmapHeader& header) override;
	virtual void visit(const IdmapData::Header& header);		void visit(const IdmapData& data) override;
	virtual void visit(const IdmapData::TypeEntry& type_entry);		void visit(const IdmapData::Header& header) override;
			void visit(const IdmapData::TypeEntry& type_entry) override;

	private:		private:
	std::ostream& stream_;		std::ostream& stream_;

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -34,11 +34,12 @@ class RawPrintVisitor : public Visitor {
	public:		public:
	explicit RawPrintVisitor(std::ostream& stream) : stream_(stream), offset_(0) {		explicit RawPrintVisitor(std::ostream& stream) : stream_(stream), offset_(0) {
	}		}
	virtual void visit(const Idmap& idmap);		~RawPrintVisitor() override = default;
	virtual void visit(const IdmapHeader& header);		void visit(const Idmap& idmap) override;
	virtual void visit(const IdmapData& data);		void visit(const IdmapHeader& header) override;
	virtual void visit(const IdmapData::Header& header);		void visit(const IdmapData& data) override;
	virtual void visit(const IdmapData::TypeEntry& type_entry);		void visit(const IdmapData::Header& header) override;
			void visit(const IdmapData::TypeEntry& type_entry) override;

	private:		private:
	void print(uint16_t value, const char* fmt, ...);		void print(uint16_t value, const char* fmt, ...);

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,7 @@ std::string GetTestDataPath();

	class Idmap2Tests : public testing::Test {		class Idmap2Tests : public testing::Test {
	protected:		protected:
	virtual void SetUp() {		void SetUp() override {
	#ifdef __ANDROID__		#ifdef __ANDROID__
	tmp_dir_path_ = "/data/local/tmp/idmap2-tests-XXXXXX";		tmp_dir_path_ = "/data/local/tmp/idmap2-tests-XXXXXX";
	#else		#else
	@@ -136,7 +136,7 @@ class Idmap2Tests : public testing::Test {
	idmap_path_ = tmp_dir_path_ + "/a.idmap";		idmap_path_ = tmp_dir_path_ + "/a.idmap";
	}		}

	virtual void TearDown() {		void TearDown() override {
	EXPECT_EQ(rmdir(tmp_dir_path_.c_str()), 0)		EXPECT_EQ(rmdir(tmp_dir_path_.c_str()), 0)
	<< "Failed to remove temporary directory " << tmp_dir_path_ << ": " << strerror(errno);		<< "Failed to remove temporary directory " << tmp_dir_path_ << ": " << strerror(errno);
	}		}