From d99faa25c0c33b9f760003f606b889fd559537c2 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 3 Mar 2021 14:51:42 +0000
Subject: [PATCH] Revert "Merge "Update Utils#getTetheringLabel usage on
 Settings" am: 2b1e3a971f am: ddf3efb070 am: 8c38e9543e"

This reverts commit 0df55e1eb44bfecc60efd6fec12e501d79862e45.

Reason for revert: Other CLs in topic were skipped, but this one wasn't, which broke sc-dev.

Change-Id: Icf61dae071416381ea11cbe74cd92ae934c3047e
---
 .../settings/network/TetherPreferenceController.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index f91f78713dc..8df0ac1f7fd 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -27,6 +27,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.ContentObserver;
+import android.net.ConnectivityManager;
 import android.net.TetheringManager;
 import android.net.Uri;
 import android.os.Bundle;
@@ -60,6 +61,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
 
     private final boolean mAdminDisallowedTetherConfig;
     private final AtomicReference<BluetoothPan> mBluetoothPan;
+    private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
     private final TetheringManager mTetheringManager;
     @VisibleForTesting
@@ -84,6 +86,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
         super(null);
         mAdminDisallowedTetherConfig = false;
         mBluetoothPan = new AtomicReference<>();
+        mConnectivityManager = null;
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         mTetheringManager = null;
     }
@@ -92,6 +95,8 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
         super(context);
         mBluetoothPan = new AtomicReference<>();
         mAdminDisallowedTetherConfig = isTetherConfigDisallowed(context);
+        mConnectivityManager =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         mTetheringManager = context.getSystemService(TetheringManager.class);
         if (lifecycle != null) {
@@ -105,7 +110,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
         mPreference = screen.findPreference(KEY_TETHER_SETTINGS);
         if (mPreference != null && !mAdminDisallowedTetherConfig) {
             mPreference.setTitle(
-                    com.android.settingslib.Utils.getTetheringLabel(mTetheringManager));
+                    com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager));
         }
     }