| commit | 3f75e50efdf639ecccf3b83985c891abd231d02c | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Jun 21 09:22:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 21 09:22:11 2022 +0000 |
| tree | bc2d3a857ad060d313d706230fd1bcd2d1fbe3ff | |
| parent | 48b7332031c71e7769135aa151f97d72fc383ab4 [diff] | |
| parent | dffd05a27009135b9de447af38c477aefc69427a [diff] |
Merge "Increase fallbacks counter when comparison result is different" into tm-dev am: 14183e64a6 am: dffd05a270 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19005472 Change-Id: If7677df573c55ce680dce3e92573da8cf9ce1882 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; }