PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable ethernet data usage when FEATURE_USB_HOST is present

Browse Source 
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.

ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.

Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
This commit is contained in:
Patrick Rohr
2023-02-03 00:55:59 +00:00
parent 888759dd9f
commit d2d340146e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -15,6 +15,7 @@
package com.android.settings.datausage; package com.android.settings.datausage;
import static android.content.pm.PackageManager.FEATURE_ETHERNET; import static android.content.pm.PackageManager.FEATURE_ETHERNET;
import static android.content.pm.PackageManager.FEATURE_USB_HOST;
import static android.content.pm.PackageManager.FEATURE_WIFI; import static android.content.pm.PackageManager.FEATURE_WIFI;
import static android.telephony.TelephonyManager.SIM_STATE_READY; import static android.telephony.TelephonyManager.SIM_STATE_READY;
@@ -70,7 +71,9 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains(ETHERNET); return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains(ETHERNET);
} }
if (!context.getPackageManager().hasSystemFeature(FEATURE_ETHERNET)) { // See ConnectivityService#deviceSupportsEthernet.
final PackageManager pm = context.getPackageManager();
if (!pm.hasSystemFeature(FEATURE_ETHERNET) && !pm.hasSystemFeature(FEATURE_USB_HOST)) {
return false; return false;
} }