Merge "Expose more useful functions that can be used by dumpstate_board()." into nyc-dev (f678562f) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,7 @@ std::string bugreport_dir;
	// TODO: change to "v1" before final N build		// TODO: change to "v1" before final N build
	static std::string VERSION_DEFAULT = "v1-dev4";		static std::string VERSION_DEFAULT = "v1-dev4";

	static bool is_user_build() {		bool is_user_build() {
	return 0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1);		return 0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1);
	}		}

	@@ -588,7 +588,6 @@ static int _add_file_from_fd(const char title, const char path, int fd) {
	return add_zip_entry_from_fd(ZIP_ROOT_DIR + path, fd) ? 0 : 1;		return add_zip_entry_from_fd(ZIP_ROOT_DIR + path, fd) ? 0 : 1;
	}		}

	/* adds all files from a directory to the zipped bugreport file */
	void add_dir(const char *dir, bool recursive) {		void add_dir(const char *dir, bool recursive) {
	if (!zip_writer) {		if (!zip_writer) {
	MYLOGD("Not adding dir %s because zip_writer is not set\n", dir);		MYLOGD("Not adding dir %s because zip_writer is not set\n", dir);

cmds/dumpstate/dumpstate.h

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,9 @@ bool add_zip_entry(const std::string& entry_name, const std::string& entry_path)
	/* adds a new entry to the existing zip file. */		/* adds a new entry to the existing zip file. */
	bool add_zip_entry_from_fd(const std::string& entry_name, int fd);		bool add_zip_entry_from_fd(const std::string& entry_name, int fd);

			/* adds all files from a directory to the zipped bugreport file */
			void add_dir(const char *dir, bool recursive);

	/* prints the contents of a file */		/* prints the contents of a file */
	int dump_file(const char title, const char path);		int dump_file(const char title, const char path);

	@@ -196,12 +199,15 @@ bool is_dir(const char* pathname);
	/** Gets the last modification time of a file, or default time if file is not found. */		/** Gets the last modification time of a file, or default time if file is not found. */
	time_t get_mtime(int fd, time_t default_mtime);		time_t get_mtime(int fd, time_t default_mtime);

	/* dump eMMC Extended CSD data */		/* Dumps eMMC Extended CSD data. */
	void dump_emmc_ecsd(const char *ext_csd_path);		void dump_emmc_ecsd(const char *ext_csd_path);

	/** gets command-line arguments */		/** Gets command-line arguments. */
	void format_args(int argc, const char argv[], std::string args);		void format_args(int argc, const char argv[], std::string args);

			/** Tells if the device is running a user build. */
			bool is_user_build();

	/*		/*
	* Helper class used to report how long it takes for a section to finish.		* Helper class used to report how long it takes for a section to finish.
	*		*