commit 3a15d6cab1e885af471ab117666f1c3055b0bc6d
author Junyu Lai <junyulai@google.com> Mon Jan 10 10:39:00 2022 +0000
committer Frank <lifr@google.com> Mon Jan 24 01:07:53 2022 +0800
tree b429e5a0e2077d031b62f46725e9034c340b8d60
parent f85ec568e5634eccf498f9be2fbd7eaa11b46afe

[MS48.2] Remove NetworkStatsHistory from CycleAdaptor

While the ChartData changes the types of stored data.
Modify CycleAdaptor accordlingly for the compatibility.

Test: atest clockwork-settings-robotests
      make RunSettingsRoboTests -j40
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=DataUsageControllerTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleChartDataLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleDataForUidLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=NetworkCycleDataLoaderTest
      make RunSettingsLibRoboTests
           ROBOTEST_FILTER=DataUsageUtilsTest
Bug: 204830222
Ignore-AOSP-First: Related API conflict, need master first.
Change-Id: Ia778d680d5354fb67476db0763dfab017284dc4a

Android.bp

diff --git a/Android.bp b/Android.bp
index 0116237..fd66974 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,6 +63,7 @@
         "androidx.lifecycle_lifecycle-extensions",
         "guava",
         "jsr305",
+        "net-utils-framework-common",
         "settings-contextual-card-protos-lite",
         "settings-log-bridge-protos-lite",
         "contextualcards",