Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d72245 authored by Patrick Rohr's avatar Patrick Rohr Committed by Automerger Merge Worker
Browse files

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

Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc183 am: ac83ccd3 am: 05e4a2f5

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



Change-Id: I7d36d2dcd3a6d0a38c58c8e25cb34c89c45ab1dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54797cb6 05e4a2f5

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

+4 −1
Original line number Diff line number Diff line
@@ -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;

        }