Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 923105b0 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Document the fact that StatFs.restat() and ctor can throw." am:... 

Merge "Document the fact that StatFs.restat() and ctor can throw." am: 183c93f6 am: e11ed001 am: a426851d
am: 8283da42

Change-Id: I78612eaa65a1beaff3b2fcb44059dcb723e2ef73
parents e3d9992a 8283da42

core/java/android/database/sqlite/SQLiteGlobal.java

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ public final class SQLiteGlobal { 
    public static int getDefaultPageSize() {

        synchronized (sLock) {

            if (sDefaultPageSize == 0) {

                // If there is an issue accessing /data, something is so seriously

                // wrong that we just let the IllegalArgumentException propagate.

                sDefaultPageSize = new StatFs("/data").getBlockSize();

            }

            return SystemProperties.getInt("debug.sqlite.pagesize", sDefaultPageSize);

core/java/android/os/StatFs.java

+7 −0
Original line number Diff line number Diff line
@@ -34,11 +34,16 @@ public class StatFs { 
     * class.

     *

     * @param path path in the desired file system to stat.

     *

     * @throws IllegalArgumentException if the file system access fails

     */

    public StatFs(String path) {

        mStat = doStat(path);

    }



    /**

     * @throws IllegalArgumentException if the file system access fails

     */

    private static StructStatVfs doStat(String path) {

        try {

            return Os.statvfs(path);
@@ -51,6 +56,8 @@ public class StatFs { 
     * Perform a restat of the file system referenced by this object. This is

     * the same as re-constructing the object with the same file system path,

     * and the new stat values are available upon return.

     *

     * @throws IllegalArgumentException if the file system access fails

     */

    public void restat(String path) {

        mStat = doStat(path);

services/core/java/com/android/server/storage/DeviceStorageMonitorService.java

+2 −1
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ public class DeviceStorageMonitorService extends SystemService { 
        mLastReportedFreeMemTime = 0;

        mResolver = context.getContentResolver();

        mIsBootImageOnDisk = isBootImageOnDisk();

        //create StatFs object

        // If these constructors throw IllegalArgumentException, something

        // is so seriously wrong that we just let the Exception propagate.

        mDataFileStats = new StatFs(DATA_PATH.getAbsolutePath());

        mSystemFileStats = new StatFs(SYSTEM_PATH.getAbsolutePath());

        mCacheFileStats = new StatFs(CACHE_PATH.getAbsolutePath());