Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace ConnectivityManager hidden symbols on SettingsLib" am: 56b1b24940 am: cf996f7f88

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9b205efdc6d5a1c0749e2fa57cdae9aa98ffaf3
This commit is contained in:
Paul Hu
2021-03-03 08:07:19 +00:00
committed by Automerger Merge Worker
parent 0e960a4719 cf996f7f88
commit a8ebd89cdb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -23,6 +23,7 @@ import android.graphics.drawable.Drawable;
import android.location.LocationManager;
import android.media.AudioManager;
import android.net.ConnectivityManager;
import android.net.TetheringManager;
import android.os.BatteryManager;
import android.os.SystemProperties;
import android.os.UserHandle;
@@ -86,10 +87,10 @@ public class Utils {
* Return string resource that best describes combination of tethering
* options available on this device.
*/
public static int getTetheringLabel(ConnectivityManager cm) {
String[] usbRegexs = cm.getTetherableUsbRegexs();
String[] wifiRegexs = cm.getTetherableWifiRegexs();
String[] bluetoothRegexs = cm.getTetherableBluetoothRegexs();
public static int getTetheringLabel(TetheringManager tm) {
String[] usbRegexs = tm.getTetherableUsbRegexs();
String[] wifiRegexs = tm.getTetherableWifiRegexs();
String[] bluetoothRegexs = tm.getTetherableBluetoothRegexs();
boolean usbAvailable = usbRegexs.length != 0;
boolean wifiAvailable = wifiRegexs.length != 0;

7
packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
View File

@@ -26,7 +26,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager;
import android.net.TetheringManager;
import android.net.TrafficStats;
import android.os.Process;
import android.os.RemoteException;
@@ -123,9 +123,8 @@ public class UidDetailProvider {
detail.icon = pm.getDefaultActivityIcon();
return detail;
case TrafficStats.UID_TETHERING:
final ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
Context.CONNECTIVITY_SERVICE);
detail.label = res.getString(Utils.getTetheringLabel(cm));
final TetheringManager tm = mContext.getSystemService(TetheringManager.class);
detail.label = res.getString(Utils.getTetheringLabel(tm));
detail.icon = pm.getDefaultActivityIcon();
return detail;
case Process.OTA_UPDATE_UID: