From 52b723beefe0e70c46e6c0930c47c57e54bc2c1f Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Sat, 22 Apr 2023 08:35:45 +0800
Subject: [PATCH] Revert "[Settings] Adjusting the control of display sequence
 (part 2)"

This reverts commit 6b379cd7cf4c3b648a24313cd11821d7c08da858.

Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
---
 .../datausage/ChartDataUsagePreference.java       | 15 ++++++++-------
 .../android/settings/datausage/DataUsageList.java |  3 ---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index dedeb7b5d16..286d9e5195d 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -73,20 +73,21 @@ public class ChartDataUsagePreference extends Preference {
     }
 
     private void onUpdateView() {
-        if ((mUsageView == null) || (mNetworkCycleChartData == null)) {
+        UsageView chart = mUsageView;
+        if ((chart == null) || (mNetworkCycleChartData == null)) {
             return;
         }
         final int top = getTop();
-        mUsageView.clearPaths();
-        mUsageView.configureGraph(toInt(mEnd - mStart), top);
-        calcPoints(mUsageView, mNetworkCycleChartData.getUsageBuckets());
-        setupContentDescription(mUsageView, mNetworkCycleChartData.getUsageBuckets());
-        mUsageView.setBottomLabels(new CharSequence[] {
+        chart.clearPaths();
+        chart.configureGraph(toInt(mEnd - mStart), top);
+        calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());
+        setupContentDescription(chart, mNetworkCycleChartData.getUsageBuckets());
+        chart.setBottomLabels(new CharSequence[] {
                 Utils.formatDateRange(getContext(), mStart, mStart),
                 Utils.formatDateRange(getContext(), mEnd, mEnd),
         });
 
-        bindNetworkPolicy(mUsageView, mPolicy, top);
+        bindNetworkPolicy(chart, mPolicy, top);
     }
 
     public int getTop() {
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index c0ccb7638dc..eea1b00e047 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -345,9 +345,6 @@ 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