From 6b379cd7cf4c3b648a24313cd11821d7c08da858 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Tue, 29 Mar 2022 11:16:45 +0800
Subject: [PATCH] [Settings] Adjusting the control of display sequence (part 2)

1. Add missing lines within file DataUsageList. (Which might lead to
   crash in some cases)
2. Change the naming based on comments within ag/17226775

Bug: 227266811
Test: robotest ChartDataUsagePreferenceTest DataUsageListTest
Change-Id: I4cde5a04befd058c2a1a3aa30826caa5b479b69f
---
 .../datausage/ChartDataUsagePreference.java       | 15 +++++++--------
 .../android/settings/datausage/DataUsageList.java |  3 +++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 286d9e5195d..dedeb7b5d16 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -73,21 +73,20 @@ public class ChartDataUsagePreference extends Preference {
     }
 
     private void onUpdateView() {
-        UsageView chart = mUsageView;
-        if ((chart == null) || (mNetworkCycleChartData == null)) {
+        if ((mUsageView == null) || (mNetworkCycleChartData == null)) {
             return;
         }
         final int top = getTop();
-        chart.clearPaths();
-        chart.configureGraph(toInt(mEnd - mStart), top);
-        calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());
-        setupContentDescription(chart, mNetworkCycleChartData.getUsageBuckets());
-        chart.setBottomLabels(new CharSequence[] {
+        mUsageView.clearPaths();
+        mUsageView.configureGraph(toInt(mEnd - mStart), top);
+        calcPoints(mUsageView, mNetworkCycleChartData.getUsageBuckets());
+        setupContentDescription(mUsageView, mNetworkCycleChartData.getUsageBuckets());
+        mUsageView.setBottomLabels(new CharSequence[] {
                 Utils.formatDateRange(getContext(), mStart, mStart),
                 Utils.formatDateRange(getContext(), mEnd, mEnd),
         });
 
-        bindNetworkPolicy(chart, mPolicy, top);
+        bindNetworkPolicy(mUsageView, mPolicy, top);
     }
 
     public int getTop() {
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 2f4054d1def..e98d4e30c28 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -315,6 +315,9 @@ public class DataUsageList extends DataUsageBaseFragment
      */
     @VisibleForTesting
     void updatePolicy() {
+        if (mHeader == null) {
+            return;
+        }
         final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate);
         final View configureButton = mHeader.findViewById(R.id.filter_settings);
         //SUB SELECT