Merge "Fixed to prevent usagestats file corruption when writing" (98fc96fc) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/UsageStatsDatabase.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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: