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

Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579

Change-Id: If7bf40d49a67c14a62e4db7994995dac9b86fb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Patrick Rohr
2023-02-03 18:15:21 +00:00
committed by Automerger Merge Worker
parent b6050b438d b0ddc1833d
commit ac83ccd34f
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;
} }