Projects >> android-frameworks-base-with-screenshot-tweaks >>e16a21c6b4f108813e5f5e00f30e0ff075de504c

Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * @deprecated Use {@link #getBlockSizeLong()} instead.
=======
     * The size, in bytes, of a block on the file system. This corresponds to
     * the Unix {@code statvfs.f_bsize} field.
>>>>>>> 4a59376d5ee031e930e61292ed9e92e96e956724
     */
    @Deprecated
    public int getBlockSize() {
Solution content 
    }

    /**
     * @deprecated Use {@link #getBlockSizeLong()} instead.
     */
    @Deprecated
    public int getBlockSize() {
File
StatFs.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * 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 statvfs.f_blocks} field.
>>>>>>> 4a59376d5ee031e930e61292ed9e92e96e956724
     */
    public long getBlockSizeLong() {
        return mStat.f_bsize;
Solution content 
    }

    /**
     * The size, in bytes, of a block on the file system. This corresponds to
     * the Unix {@code statvfs.f_bsize} field.
     */
    public long getBlockSizeLong() {
        return mStat.f_bsize;
File
StatFs.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * 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.
=======
     * The number of blocks that are free on the file system and available to
     * applications. This corresponds to the Unix {@code statvfs.f_bavail} field.
>>>>>>> 4a59376d5ee031e930e61292ed9e92e96e956724
     */
    public long getFreeBytes() {
        return mStat.f_bfree * mStat.f_bsize;
Solution content 
    }

    /**
     * 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;
File
StatFs.java
Developer's decision
Version 1
Kind of conflict
Comment