summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
authorQuang Luong <qal@google.com>2020-09-11 18:30:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-09-11 18:30:33 +0000
commita2da145ff6cdf0767b91998c17d33d0c601c543c (patch)
treea2d49c3cfee6a889b94d5f153dc5236a3ba08239 /packages/SettingsLib/src
parent76cf584185b6e24eb3eff356ceb434ecdff5ebf2 (diff)
parentc3633c0dbf38b3fb57121efd4d29f88f75ab81ca (diff)
Merge "Use WifiEntry#shouldShowXLevelIcon() to show X in level icon" into rvc-qpr-dev
Diffstat (limited to 'packages/SettingsLib/src')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
index bba69f29a290..aad0d3af6626 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
@@ -35,7 +35,6 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settingslib.R;
import com.android.settingslib.Utils;
import com.android.wifitrackerlib.WifiEntry;
-import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
/**
* Preference to display a WifiEntry in a wifi picker.
@@ -138,11 +137,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
public void refresh() {
setTitle(mWifiEntry.getTitle());
final int level = mWifiEntry.getLevel();
- final ConnectedInfo connectedInfo = mWifiEntry.getConnectedInfo();
- boolean showX = false;
- if (connectedInfo != null) {
- showX = !connectedInfo.isDefaultNetwork || !connectedInfo.isValidated;
- }
+ final boolean showX = mWifiEntry.shouldShowXLevelIcon();
if (level != mLevel || showX != mShowX) {
mLevel = level;
mShowX = showX;