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

Merge "Fixed to prevent usagestats file corruption when writing" am: 98fc96fc65 am: acb36aadda

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6bf40e6f362f9153cc5331e42af33b814e988d4
This commit is contained in:
Varun Shah
2021-01-30 00:06:45 +00:00
committed by Automerger Merge Worker
parent 40b8fc37d4 acb36aadda
commit 9d58180bfa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/usage/java/com/android/server/usage/UsageStatsDatabase.java
View File

@@ -1025,6 +1025,8 @@ public class UsageStatsDatabase {
writeLocked(fos, stats, version, packagesTokenData);
file.finishWrite(fos);
fos = null;
} catch (Exception e) {
// Do nothing. Exception has already been handled.
} finally {
// When fos is null (successful write), this will no-op
file.failWrite(fos);
@@ -1032,7 +1034,7 @@ public class UsageStatsDatabase {
}
private static void writeLocked(OutputStream out, IntervalStats stats, int version,
PackagesTokenData packagesTokenData) throws RuntimeException {
PackagesTokenData packagesTokenData) throws Exception {
switch (version) {
case 1:
case 2:
@@ -1044,6 +1046,7 @@ public class UsageStatsDatabase {
UsageStatsProto.write(out, stats);
} catch (Exception e) {
Slog.e(TAG, "Unable to write interval stats to proto.", e);
throw e;
}
break;
case 5:
@@ -1052,6 +1055,7 @@ public class UsageStatsDatabase {
UsageStatsProtoV2.write(out, stats);
} catch (Exception e) {
Slog.e(TAG, "Unable to write interval stats to proto.", e);
throw e;
}
break;
default: