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

Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2013-04-19 18:21:08 +00:00
committed by Android (Google) Code Review
parent f535c820c4 b81440bd9b
commit 24b55f25c1
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/current.txt
View File

@@ -17524,16 +17524,17 @@ package android.os {
public class StatFs {
ctor public StatFs(java.lang.String);
method public int getAvailableBlocks();
method public deprecated int getAvailableBlocks();
method public long getAvailableBlocksLong();
method public long getAvailableBytes();
method public int getBlockCount();
method public deprecated int getBlockCount();
method public long getBlockCountLong();
method public int getBlockSize();
method public deprecated int getBlockSize();
method public long getBlockSizeLong();
method public int getFreeBlocks();
method public deprecated int getFreeBlocks();
method public long getFreeBlocksLong();
method public long getFreeBytes();
method public long getTotalBytes();
method public void restat(java.lang.String);
}

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

@@ -57,9 +57,9 @@ public class StatFs {
}
/**
* The size, in bytes, of a block on the file system. This corresponds to
* the Unix {@code statfs.f_bsize} field.
* @deprecated Use {@link #getBlockSizeLong()} instead.
*/
@Deprecated
public int getBlockSize() {
return (int) mStat.f_bsize;
}
@@ -73,27 +73,25 @@ public class StatFs {
}
/**
* The total number of blocks on the file system. This corresponds to the
* Unix {@code statfs.f_blocks} field.
* @deprecated Use {@link #getBlockCountLong()} instead.
*/
@Deprecated
public int getBlockCount() {
return (int) mStat.f_blocks;
}
/**
* The size, in bytes, of a block on the file system. This corresponds to
* the Unix {@code statfs.f_bsize} field.
* The total number of blocks on the file system. This corresponds to the
* Unix {@code statfs.f_blocks} field.
*/
public long getBlockCountLong() {
return mStat.f_blocks;
}
/**
* 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
* will want to use {@link #getAvailableBlocks()} instead.
* @deprecated Use {@link #getFreeBlocksLong()} instead.
*/
@Deprecated
public int getFreeBlocks() {
return (int) mStat.f_bfree;
}
@@ -109,17 +107,18 @@ public class StatFs {
}
/**
* The number of bytes that are free on the file system, including
* reserved blocks (that are not available to normal applications).
* The number of bytes that are free on the file system, including reserved
* blocks (that are not available to normal applications). Most applications
* will want to use {@link #getAvailableBytes()} instead.
*/
public long getFreeBytes() {
return mStat.f_bfree * mStat.f_bsize;
}
/**
* 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.
* @deprecated Use {@link #getAvailableBlocksLong()} instead.
*/
@Deprecated
public int getAvailableBlocks() {
return (int) mStat.f_bavail;
}
@@ -139,4 +138,11 @@ public class StatFs {
public long getAvailableBytes() {
return mStat.f_bavail * mStat.f_bsize;
}
/**
* The total number of bytes supported by the file system.
*/
public long getTotalBytes() {
return mStat.f_blocks * mStat.f_bsize;
}
}