| commit | 18ea0e8d965dc627bbdeb97fb3538cfeede0094f | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Jun 21 09:23:31 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 21 09:23:31 2022 +0000 |
| tree | f8d4ef607e3a0bb41e345eda0ad92ddca0379981 | |
| parent | c1ddaa403701f41d42ab6a07aa2f203687ecc1a6 [diff] | |
| parent | 7358a88feea9bf542040f8b9487f2c432d139ad9 [diff] |
Merge "Increase fallbacks counter when comparison result is different" into tm-dev am: 14183e64a6 am: 7358a88fee Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19005472 Change-Id: Ie096b623f48314f5efa8809260128173feead233 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 b955db9..6476e1a 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; }