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 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)); } }