commit 42bd1b601cf2e3090d4c794db73171090e9759a6
author Junyu Lai <junyulai@google.com> Wed Jun 22 07:22:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 22 07:22:04 2022 +0000
tree 29261a230cd2425336b4f98859d2daefd094dede
parent a5948fe46593d1bd41b4cbf385cbd6b812e95c3b
parent 239b67a3cb07602ad5a397efc587c2853e376454

Increase fallbacks counter when comparison result is different am: 239b67a3cb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133169

Change-Id: Ic3c42fee92e3b070aa8515e19c812a4fa672af47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service-t/src/com/android/server/net/NetworkStatsService.java

diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java
index 80a4372..e41034a 100644
--- a/service-t/src/com/android/server/net/NetworkStatsService.java
+++ b/service-t/src/com/android/server/net/NetworkStatsService.java
@@ -1143,10 +1143,12 @@
             if (error != null) {
                 Log.wtf(TAG, "Unexpected comparison result for recorder "
                         + legacyRecorder.getCookie() + ": " + error);
+                return false;
             }
         } catch (Throwable e) {
             Log.wtf(TAG, "Failed to compare migrated stats with legacy stats for recorder "
                     + legacyRecorder.getCookie(), e);
+            return false;
         }
         return true;
     }