diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-17 14:16:53 +0800 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2021-03-17 15:23:01 +0000 |
| commit | c6b729eea8d8a62b0ad9a642f245a63213f09e88 (patch) | |
| tree | b74b20c5118238541d2e441cedd63ea2fb0e9e77 /packages/SettingsLib/src/com/android/settingslib/Utils.java | |
| parent | 0255ab4694e242f07e450dd7f42443a6c60c27e6 (diff) | |
Replace hidden CM#isNetworkSupported() usage
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
Merged-In: I713c6410fcf9543d54d9b0057ed7b2ecdab201ee
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/Utils.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/Utils.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index ad459a4c3b93..40a457f3f626 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -22,7 +22,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.location.LocationManager; import android.media.AudioManager; -import android.net.ConnectivityManager; import android.net.TetheringManager; import android.os.BatteryManager; import android.os.SystemProperties; @@ -33,6 +32,7 @@ import android.provider.Settings; import android.telephony.AccessNetworkConstants; import android.telephony.NetworkRegistrationInfo; import android.telephony.ServiceState; +import android.telephony.TelephonyManager; import androidx.annotation.NonNull; import androidx.core.graphics.drawable.RoundedBitmapDrawable; @@ -435,8 +435,7 @@ public class Utils { } public static boolean isWifiOnly(Context context) { - return !context.getSystemService(ConnectivityManager.class) - .isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + return !context.getSystemService(TelephonyManager.class).isDataCapable(); } /** Returns if the automatic storage management feature is turned on or not. **/ |