From d2d340146ec165cbe5dbe6107396dddafee04a8a Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 3 Feb 2023 00:55:59 +0000 Subject: [PATCH] Enable ethernet data usage when FEATURE_USB_HOST is present 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 --- src/com/android/settings/datausage/DataUsageUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java index 52272844344..9fec27e0bef 100644 --- a/src/com/android/settings/datausage/DataUsageUtils.java +++ b/src/com/android/settings/datausage/DataUsageUtils.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; 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.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); } - 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; }