Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master

Browse Source 
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.
This commit is contained in:
Elliott Hughes
2013-07-09 15:28:51 -07:00
committed by Android Git Automerger
parent 4d380d71e0 e16a21c6b4
commit dff4ec87e7
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/os/StatFs.java
View File

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

4
packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
View File

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