Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace hidden CM#isNetworkSupported() usage" am: 976a18e914

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639903

Change-Id: I0ec433ac0403fa2189c6424acf963aea1f324410
This commit is contained in:
Treehugger Robot
2021-03-18 03:25:20 +00:00
committed by Automerger Merge Worker
parent 361882fae0 976a18e914
commit 3ca15774bf
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -22,7 +22,6 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.location.LocationManager; import android.location.LocationManager;
import android.media.AudioManager; import android.media.AudioManager;
import android.net.ConnectivityManager;
import android.net.TetheringManager; import android.net.TetheringManager;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.SystemProperties; import android.os.SystemProperties;
@@ -33,6 +32,7 @@ import android.provider.Settings;
import android.telephony.AccessNetworkConstants; import android.telephony.AccessNetworkConstants;
import android.telephony.NetworkRegistrationInfo; import android.telephony.NetworkRegistrationInfo;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.graphics.drawable.RoundedBitmapDrawable; import androidx.core.graphics.drawable.RoundedBitmapDrawable;
@@ -435,8 +435,7 @@ public class Utils {
} }
public static boolean isWifiOnly(Context context) { public static boolean isWifiOnly(Context context) {
return !context.getSystemService(ConnectivityManager.class) return !context.getSystemService(TelephonyManager.class).isDataCapable();
.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
} }
/** Returns if the automatic storage management feature is turned on or not. **/ /** Returns if the automatic storage management feature is turned on or not. **/

5
packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
View File

@@ -16,7 +16,6 @@
package com.android.settingslib.net; package com.android.settingslib.net;
import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.NetworkStatsHistory.FIELD_RX_BYTES; import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;
import static android.net.NetworkStatsHistory.FIELD_TX_BYTES; import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;
import static android.net.TrafficStats.MB_IN_BYTES; import static android.net.TrafficStats.MB_IN_BYTES;
@@ -59,7 +58,6 @@ public class DataUsageController {
PERIOD_BUILDER, Locale.getDefault()); PERIOD_BUILDER, Locale.getDefault());
private final Context mContext; private final Context mContext;
private final ConnectivityManager mConnectivityManager;
private final INetworkStatsService mStatsService; private final INetworkStatsService mStatsService;
private final NetworkPolicyManager mPolicyManager; private final NetworkPolicyManager mPolicyManager;
private final NetworkStatsManager mNetworkStatsManager; private final NetworkStatsManager mNetworkStatsManager;
@@ -71,7 +69,6 @@ public class DataUsageController {
public DataUsageController(Context context) { public DataUsageController(Context context) {
mContext = context; mContext = context;
mConnectivityManager = ConnectivityManager.from(context);
mStatsService = INetworkStatsService.Stub.asInterface( mStatsService = INetworkStatsService.Stub.asInterface(
ServiceManager.getService(Context.NETWORK_STATS_SERVICE)); ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
mPolicyManager = NetworkPolicyManager.from(mContext); mPolicyManager = NetworkPolicyManager.from(mContext);
@@ -236,7 +233,7 @@ public class DataUsageController {
public boolean isMobileDataSupported() { public boolean isMobileDataSupported() {
// require both supported network and ready SIM // require both supported network and ready SIM
return mConnectivityManager.isNetworkSupported(TYPE_MOBILE) return getTelephonyManager().isDataCapable()
&& getTelephonyManager().getSimState() == SIM_STATE_READY; && getTelephonyManager().getSimState() == SIM_STATE_READY;
} }