commit dffd05a27009135b9de447af38c477aefc69427a
author Junyu Lai <junyulai@google.com> Tue Jun 21 09:03:21 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 09:03:21 2022 +0000
tree bc2d3a857ad060d313d706230fd1bcd2d1fbe3ff
parent d9bc3e697ce00a2046f3b4b9662613d0e0fdad01
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: Icc61d8d24251b223a7f4d8b5a8786e9a4e46469c
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;
     }