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." am: b68106cf2a

Browse Source 
am: ca7a43b5da

Change-Id: I51d5a6e7194a2fddfbedafbddb9816649ae4aa44
This commit is contained in:
Tobias Thierer
2016-08-03 10:09:22 +00:00
committed by android-build-merger
parent bad5969a77 ca7a43b5da
commit 3b5e46bf9b
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

@@ -736,7 +736,7 @@ public final class DropBoxManagerService extends SystemService {
* Trims the files on disk to make sure they aren't using too much space.
* @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).
int ageSeconds = Settings.Global.getInt(mContentResolver,
@@ -768,7 +768,12 @@ public final class DropBoxManagerService extends SystemService {
int quotaKb = Settings.Global.getInt(mContentResolver,
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 nonreserved = available - mStatFs.getBlockCount() * reservePercent / 100;
int maximum = quotaKb * 1024 / mBlockSize;