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

Replace hidden CM#isNetworkSupported() usage

Browse Source 
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settingslib use it to
check if device support telephony service. Use alternative
method to check if device supports such feature.

Bug: 172183305
Test: make RunSettingsLibRoboTests
Change-Id: I713c6410fcf9543d54d9b0057ed7b2ecdab201ee
This commit is contained in:
Chiachang Wang
2021-03-17 14:16:53 +08:00
parent 8017e2b6dd
commit 104cd7c155
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

@@ -23,7 +23,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.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.TetheringManager; import android.net.TetheringManager;
import android.net.vcn.VcnTransportInfo; import android.net.vcn.VcnTransportInfo;
@@ -37,6 +36,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;
@@ -439,8 +439,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;
} }