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

Merge "Fixes the system server crash issue caused by uncatched exception."

Browse Source
This commit is contained in:
Tobias Thierer
2016-08-03 09:54:53 +00:00
committed by Gerrit Code Review
parent 554284edf3 c5e249b9e0
commit b68106cf2a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/DropBoxManagerService.java
View File

@@ -696,7 +696,7 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub {
* Trims the files on disk to make sure they aren't using too much space. * Trims the files on disk to make sure they aren't using too much space.
* @return the overall quota for storage (in bytes) * @return the overall quota for storage (in bytes)
*/ */
private synchronized long trimToFit() { private synchronized long trimToFit() throws IOException {
// Expunge aged items (including tombstones marking deleted data). // Expunge aged items (including tombstones marking deleted data).
int ageSeconds = Settings.Global.getInt(mContentResolver, int ageSeconds = Settings.Global.getInt(mContentResolver,
@@ -728,7 +728,12 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub {
int quotaKb = Settings.Global.getInt(mContentResolver, int quotaKb = Settings.Global.getInt(mContentResolver,
Settings.Global.DROPBOX_QUOTA_KB, DEFAULT_QUOTA_KB); Settings.Global.DROPBOX_QUOTA_KB, DEFAULT_QUOTA_KB);
mStatFs.restat(mDropBoxDir.getPath()); String dirPath = mDropBoxDir.getPath();
try {
mStatFs.restat(dirPath);
} catch (IllegalArgumentException e) { // restat throws this on error
throw new IOException("Can't restat: " + mDropBoxDir);
}
int available = mStatFs.getAvailableBlocks(); int available = mStatFs.getAvailableBlocks();
int nonreserved = available - mStatFs.getBlockCount() * reservePercent / 100; int nonreserved = available - mStatFs.getBlockCount() * reservePercent / 100;
int maximum = quotaKb * 1024 / mBlockSize; int maximum = quotaKb * 1024 / mBlockSize;