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 am: 9d58180bfa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd140356f26f89fa8b182946cde729f2fb0df490
This commit is contained in:
Varun Shah
2021-01-30 00:53:53 +00:00
committed by Automerger Merge Worker
parent 435a2ef906 9d58180bfa
commit b47c463107
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

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