resolved conflicts for merge of 4a59376d to stage-aosp-master (e16a21c6) · Commits · e / os / android_frameworks_base

core/java/android/os/StatFs.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@ package android.os;

		import libcore.io.ErrnoException;
		import libcore.io.Libcore;
		import libcore.io.StructStatFs;
		import libcore.io.StructStatVfs;

		/**
		* Retrieve overall information about the space on a filesystem. This is a
		* wrapper for Unix statfs().
		* wrapper for Unix statvfs().
		*/
		public class StatFs {
		private StructStatFs mStat;
		private StructStatVfs mStat;

		/**
		* Construct a new StatFs for looking at the stats of the filesystem at
		@@ -39,9 +39,9 @@ public class StatFs {
		mStat = doStat(path);
		}

		private static StructStatFs doStat(String path) {
		private static StructStatVfs doStat(String path) {
		try {
		return Libcore.os.statfs(path);
		return Libcore.os.statvfs(path);
		} catch (ErrnoException e) {
		throw new IllegalArgumentException("Invalid path: " + path, e);
		}
		@@ -66,7 +66,7 @@ public class StatFs {

		/**
		* The size, in bytes, of a block on the file system. This corresponds to
		* the Unix {@code statfs.f_bsize} field.
		* the Unix {@code statvfs.f_bsize} field.
		*/
		public long getBlockSizeLong() {
		return mStat.f_bsize;
		@@ -82,7 +82,7 @@ public class StatFs {

		/**
		* The total number of blocks on the file system. This corresponds to the
		* Unix {@code statfs.f_blocks} field.
		* Unix {@code statvfs.f_blocks} field.
		*/
		public long getBlockCountLong() {
		return mStat.f_blocks;
		@@ -99,7 +99,7 @@ public class StatFs {
		/**
		* The total number of blocks that are free on the file system, including
		* reserved blocks (that are not available to normal applications). This
		* corresponds to the Unix {@code statfs.f_bfree} field. Most applications
		* corresponds to the Unix {@code statvfs.f_bfree} field. Most applications
		* will want to use {@link #getAvailableBlocks()} instead.
		*/
		public long getFreeBlocksLong() {
		@@ -125,7 +125,7 @@ public class StatFs {

		/**
		* The number of blocks that are free on the file system and available to
		* applications. This corresponds to the Unix {@code statfs.f_bavail} field.
		* applications. This corresponds to the Unix {@code statvfs.f_bavail} field.
		*/
		public long getAvailableBlocksLong() {
		return mStat.f_bavail;

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ import libcore.io.ErrnoException;
		import libcore.io.IoUtils;
		import libcore.io.Libcore;
		import libcore.io.Streams;
		import libcore.io.StructStatFs;
		import libcore.io.StructStatVfs;

		/*
		* This service copies a downloaded apk to a file passed in as
		@@ -244,7 +244,7 @@ public class DefaultContainerService extends IntentService {
		Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);

		try {
		final StructStatFs stat = Libcore.os.statfs(path);
		final StructStatVfs stat = Libcore.os.statvfs(path);
		final long totalSize = stat.f_blocks * stat.f_bsize;
		final long availSize = stat.f_bavail * stat.f_bsize;
		return new long[] { totalSize, availSize };