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

Merge "Replace ConnectivityManager hidden symbols on SettingsLib"

Browse Source
This commit is contained in:
Paul Hu
2021-03-03 02:15:22 +00:00
committed by Gerrit Code Review
parent f2781e9b3c ef0f87ca52
commit 56b1b24940
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

@@ -19,6 +19,7 @@ import android.graphics.drawable.Drawable;
import android.location.LocationManager; import android.location.LocationManager;
import android.media.AudioManager; import android.media.AudioManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.TetheringManager;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
@@ -78,10 +79,10 @@ public class Utils {
* Return string resource that best describes combination of tethering * Return string resource that best describes combination of tethering
* options available on this device. * options available on this device.
*/ */
public static int getTetheringLabel(ConnectivityManager cm) { public static int getTetheringLabel(TetheringManager tm) {
String[] usbRegexs = cm.getTetherableUsbRegexs(); String[] usbRegexs = tm.getTetherableUsbRegexs();
String[] wifiRegexs = cm.getTetherableWifiRegexs(); String[] wifiRegexs = tm.getTetherableWifiRegexs();
String[] bluetoothRegexs = cm.getTetherableBluetoothRegexs(); String[] bluetoothRegexs = tm.getTetherableBluetoothRegexs();
boolean usbAvailable = usbRegexs.length != 0; boolean usbAvailable = usbRegexs.length != 0;
boolean wifiAvailable = wifiRegexs.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.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager; import android.net.TetheringManager;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
@@ -123,9 +123,8 @@ public class UidDetailProvider {
detail.icon = pm.getDefaultActivityIcon(); detail.icon = pm.getDefaultActivityIcon();
return detail; return detail;
case TrafficStats.UID_TETHERING: case TrafficStats.UID_TETHERING:
final ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService( final TetheringManager tm = mContext.getSystemService(TetheringManager.class);
Context.CONNECTIVITY_SERVICE); detail.label = res.getString(Utils.getTetheringLabel(tm));
detail.label = res.getString(Utils.getTetheringLabel(cm));
detail.icon = pm.getDefaultActivityIcon(); detail.icon = pm.getDefaultActivityIcon();
return detail; return detail;
case Process.OTA_UPDATE_UID: case Process.OTA_UPDATE_UID: