Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d am: ac83ccd34f am: 05e4a2f56b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579
Change-Id: I7d36d2dcd3a6d0a38c58c8e25cb34c89c45ab1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index 5227284..9fec27e 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 @@
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;
}