commit da1bb0f817073ffc4c13bdef782ad476e5fa8f07
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 09 23:09:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 23:09:33 2019 +0000
tree 1e25a99d210bb1624a08a699473ebd7cd9a06cc3
parent f87be0f03818fdc7ecc67c1e5ea0dfd41213b5c7
parent acb33e6c5856c0d999640ea5f02f0d6fdf0cd99e

Merge "DO NOT MERGE Fixing the failing tests" into pi-car-dev

src/com/android/car/settings/datausage/AppDataUsageFragment.java

diff --git a/src/com/android/car/settings/datausage/AppDataUsageFragment.java b/src/com/android/car/settings/datausage/AppDataUsageFragment.java
index b613e68..2c756e2 100644
--- a/src/com/android/car/settings/datausage/AppDataUsageFragment.java
+++ b/src/com/android/car/settings/datausage/AppDataUsageFragment.java
@@ -97,14 +97,13 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Bundle bundle = getBundleForNetworkStats();
+        mBundle = getBundleForNetworkStats();
 
         LoaderManager loaderManager = LoaderManager.getInstance(this);
-        mAppsNetworkStatsManager.startLoading(loaderManager, bundle);
+        mAppsNetworkStatsManager.startLoading(loaderManager, mBundle);
     }
 
-    @VisibleForTesting
-    Bundle getBundleForNetworkStats() {
+    private Bundle getBundleForNetworkStats() {
         long historyStart = System.currentTimeMillis();
         long historyEnd = historyStart + 1;
 
@@ -139,4 +138,9 @@
 
         return SummaryForAllUidLoader.buildArgs(mNetworkTemplate, start, end);
     }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    Bundle getBundle() {
+        return mBundle;
+    }
 }

tests/robotests/src/com/android/car/settings/datausage/AppDataUsageFragmentTest.java

diff --git a/tests/robotests/src/com/android/car/settings/datausage/AppDataUsageFragmentTest.java b/tests/robotests/src/com/android/car/settings/datausage/AppDataUsageFragmentTest.java
index e4cf647..c94cfa8 100644
--- a/tests/robotests/src/com/android/car/settings/datausage/AppDataUsageFragmentTest.java
+++ b/tests/robotests/src/com/android/car/settings/datausage/AppDataUsageFragmentTest.java
@@ -85,7 +85,7 @@
     public void onActivityCreated_policyIsNull_startAndEndDateShouldHaveFourWeeksDifference() {
         mFragmentController.create();
 
-        Bundle bundle = mFragment.getBundleForNetworkStats();
+        Bundle bundle = mFragment.getBundle();
         long start = bundle.getLong(KEY_START);
         long end = bundle.getLong(KEY_END);
         long timeDiff = end - start;
@@ -102,7 +102,7 @@
         ShadowNetworkPolicyManager.setCycleIterator(iterator);
         mFragmentController.create();
 
-        Bundle bundle = mFragment.getBundleForNetworkStats();
+        Bundle bundle = mFragment.getBundle();
         long start = bundle.getLong(KEY_START);
         long end = bundle.getLong(KEY_END);
         long timeDiff = end - start;
@@ -130,7 +130,7 @@
         ShadowNetworkPolicyManager.setCycleIterator(iterator);
         mFragmentController.create();
 
-        Bundle bundle = mFragment.getBundleForNetworkStats();
+        Bundle bundle = mFragment.getBundle();
         long start = bundle.getLong(KEY_START);
         long end = bundle.getLong(KEY_END);