diff options
| author | Paul Hu <paulhu@google.com> | 2021-03-03 16:46:35 +0000 |
|---|---|---|
| committer | Paul Hu <paulhu@google.com> | 2021-03-03 16:46:35 +0000 |
| commit | b993c666fed3f175e3926851ae83fca32faff7fb (patch) | |
| tree | 4546d821171c722c1d83f4fb367a624ce009e979 /packages/SettingsLib/src/com/android/settingslib/Utils.java | |
| parent | 03f060702a8d064f6fa9b2f79de56eea2dc61fdd (diff) | |
Revert "resolve merge conflicts of a8ebd89cdb11dbedfff2a55346f936ff9c9f5259 to sc-dev"
This reverts commit 03f060702a8d064f6fa9b2f79de56eea2dc61fdd.
Reason for revert: Build break commit has been reverted.
Change-Id: Ie80a4173e92709a2ab75c6c2174adacf58c2f776
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/Utils.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/Utils.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 9c0c80bff3df..ff70eda68a5d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -25,7 +25,6 @@ import android.location.LocationManager; import android.media.AudioManager; import android.net.ConnectivityManager; import android.net.NetworkCapabilities; -import android.net.TetheringManager; import android.net.vcn.VcnTransportInfo; import android.net.wifi.WifiInfo; import android.os.BatteryManager; @@ -91,10 +90,10 @@ public class Utils { * Return string resource that best describes combination of tethering * options available on this device. */ - public static int getTetheringLabel(TetheringManager tm) { - String[] usbRegexs = tm.getTetherableUsbRegexs(); - String[] wifiRegexs = tm.getTetherableWifiRegexs(); - String[] bluetoothRegexs = tm.getTetherableBluetoothRegexs(); + public static int getTetheringLabel(ConnectivityManager cm) { + String[] usbRegexs = cm.getTetherableUsbRegexs(); + String[] wifiRegexs = cm.getTetherableWifiRegexs(); + String[] bluetoothRegexs = cm.getTetherableBluetoothRegexs(); boolean usbAvailable = usbRegexs.length != 0; boolean wifiAvailable = wifiRegexs.length != 0; |