commit b0ddc1833d50ca967c4ec5208b4c26ebb9c1a16f
author Patrick Rohr <prohr@google.com> Fri Feb 03 17:28:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 03 17:28:34 2023 +0000
tree 48ef198242332febaeeb59fb504753cda561ceb7
parent 888759dd9f5055d83e936d1fba600d2b82d4d7d0
parent d2d340146ec165cbe5dbe6107396dddafee04a8a

Merge "Enable ethernet data usage when FEATURE_USB_HOST is present"

src/com/android/settings/datausage/DataUsageUtils.java

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;
         }