commit 20d3847f9629bfb55f7c0b32c2c5022766811715
author Junyu Lai <junyulai@google.com> Tue Jun 21 09:03:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 09:03:46 2022 +0000
tree 09bcd1b7e5090b9ef5de54d6223396186154b648
parent 0275fcb261673e117d89a94f1346a105168f0323
parent 14183e64a60a52d47340f8ab8ed863bdde4887d3

Merge "Increase fallbacks counter when comparison result is different" into tm-dev am: 14183e64a6

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

Change-Id: I1a6c4dc9879b57187e6678eb212e9685549f0ffb
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 02f268b..4d04461 100644
--- a/service-t/src/com/android/server/net/NetworkStatsService.java
+++ b/service-t/src/com/android/server/net/NetworkStatsService.java
@@ -1154,10 +1154,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;
     }