Merge "Storaged cleanup" (ce929815) · Commits · e / os / android_system_core

storaged/main.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -290,7 +290,6 @@ int main(int argc, char** argv) {
		sort_running_tasks_info(res);
		log_console_running_tasks_info(res);


		return 0;
		}

+5 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		#include <time.h>
		#include <unistd.h>


		#include <android-base/logging.h>

		#include <storaged.h>

+7 −9

Original line number	Diff line number	Diff line
		@@ -16,15 +16,15 @@

		#define LOG_TAG "storaged"

		#include <dirent.h>
		#include <fcntl.h>
		#include <sys/stat.h>
		#include <linux/time.h>

		#include <dirent.h>
		#include <stdio.h>
		#include <stdint.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <string.h>
		#include <sys/stat.h>
		#include <time.h>
		#include <unistd.h>

		#include <sstream>
		@@ -32,18 +32,16 @@
		#include <unordered_map>

		#include <android-base/file.h>
		#include <android-base/logging.h>
		#include <android-base/stringprintf.h>
		#include <android-base/strings.h>
		#include <android-base/logging.h>
		#include <cutils/klog.h>
		#include <log/log.h>
		#include <log/log_event_list.h>
		#include <cutils/klog.h>

		#include <storaged.h>
		#include <storaged_utils.h>

		#include <time.h>

		#define SECTOR_SIZE ( 512 )
		#define SEC_TO_MSEC ( 1000 )
		#define MSEC_TO_USEC ( 1000 )

+0 −1

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

		#include <gtest/gtest.h>
		//#include <private/android_logger.h>

		#include <storaged.h> // data structures
		#include <storaged_utils.h> // functions to test

+1 −1

File changed.

Contains only whitespace changes.