summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuang Anh Luong <qal@google.com>2023-11-15 16:29:14 +0900
committerQuang Luong <qal@google.com>2023-11-16 01:02:16 +0000
commitcbb0ae8de39c0cd37d4634b05bf442472fae5738 (patch)
tree7116e4c654e00709912f7b6d499328f30464aa40
parentcc5dcf59073c57fedb4fcb3e7d9f4a531c751cdd (diff)
downloadwifi-cbb0ae8de39c0cd37d4634b05bf442472fae5738.tar.gz
Fix passpoint suggestions not showing SSID in Network Details
Settings shows the SSID in Network Details if WifiEntry.isSubscription() is true, which isn't true for passpoint suggestions. To fix this, add a new method "shouldShowSsid()" to explicitly tell Settings to show the SSID preference. Bug: 300205461 Test: atest WifiTrackerLibTests Change-Id: I59a1fd6051d6048c771a04abb6b4ce91ce1af3f4
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java5
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java8
2 files changed, 13 insertions, 0 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
index d9876e4d8..f156efbf0 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
@@ -224,6 +224,11 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
}
@Override
+ public boolean shouldShowSsid() {
+ return true;
+ }
+
+ @Override
public synchronized String getSsid() {
if (mWifiInfo != null) {
return sanitizeSsid(mWifiInfo.getSSID());
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
index 8c78e81f7..814e08b4c 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java
@@ -402,6 +402,14 @@ public class WifiEntry {
}
/**
+ * Returns whether this network should display its SSID separately from the title
+ * (e.g. the Network Details page), for networks whose display titles differ from the SSID.
+ */
+ public boolean shouldShowSsid() {
+ return false;
+ }
+
+ /**
* Returns the SSID of the entry, if applicable. Null otherwise.
*/
@Nullable