commit c209a326c5790ed7f5406e2ecf61f073a4732699
author Jahdiel Alvarez <jahdiel@google.com> Tue Aug 31 23:52:43 2021 +0000
committer Jahdiel Alvarez <jahdiel@google.com> Fri Sep 10 20:02:32 2021 +0000
tree d86f4e4d90c475265219e012734a73edf6d0c227
parent bb2cea3338052b62b2d40e8d237791bf75ac1cee

Set forgiven bytes to default PerStateBytes object when resetting stats.

Instead of setting forgiven bytes to null when resetting stats, set
forgiven bytes to new PerStateBytes object.

Test: atest CarWatchdogServiceUnitTest
Bug: 198302302
Change-Id: I20d7072566f7e4ce2fddd16a042580484213d781
Merged-In: I20d7072566f7e4ce2fddd16a042580484213d781
(cherry picked from commit db455ec6dfd50bbe73b8ec00569534a26f62bd9f)

service/src/com/android/car/watchdog/WatchdogPerfHandler.java

diff --git a/service/src/com/android/car/watchdog/WatchdogPerfHandler.java b/service/src/com/android/car/watchdog/WatchdogPerfHandler.java
index fee73b9..251444e 100644
--- a/service/src/com/android/car/watchdog/WatchdogPerfHandler.java
+++ b/service/src/com/android/car/watchdog/WatchdogPerfHandler.java
@@ -1705,12 +1705,14 @@
     }
     /** Defines I/O usage fields for a package. */
     public static final class PackageIoUsage {
+        private static final android.automotive.watchdog.PerStateBytes DEFAULT_PER_STATE_BYTES =
+                new android.automotive.watchdog.PerStateBytes();
         private android.automotive.watchdog.IoOveruseStats mIoOveruseStats;
         private android.automotive.watchdog.PerStateBytes mForgivenWriteBytes;
         private int mTotalTimesKilled;
 
         private PackageIoUsage() {
-            mForgivenWriteBytes = new android.automotive.watchdog.PerStateBytes();
+            mForgivenWriteBytes = DEFAULT_PER_STATE_BYTES;
             mTotalTimesKilled = 0;
         }
 
@@ -1777,7 +1779,7 @@
 
         void resetStats() {
             mIoOveruseStats = null;
-            mForgivenWriteBytes = null;
+            mForgivenWriteBytes = DEFAULT_PER_STATE_BYTES;
             mTotalTimesKilled = 0;
         }
     }