diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 1010a8aea2ac3..ec52742c36c84 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -73,8 +73,10 @@
Saved by %1$s
-
- Connected via Wi\u2011Fi assistant
+
+ Automatically connected via %1$s
+
+ Automatically connected via Network Quality Scorer
Connected via %1$s
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index fed48b441b1ce..45004c4bc27a4 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -27,6 +27,8 @@ import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkInfo.State;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppData;
import android.net.ScoredNetwork;
import android.net.wifi.IWifiManager;
import android.net.wifi.ScanResult;
@@ -949,7 +951,15 @@ public class AccessPoint implements Comparable {
return String.format(format, passpointProvider);
} else if (isEphemeral) {
// Special case for connected + ephemeral networks.
- return context.getString(R.string.connected_via_wfa);
+ final NetworkScoreManager networkScoreManager = context.getSystemService(
+ NetworkScoreManager.class);
+ NetworkScorerAppData scorer = networkScoreManager.getActiveScorer();
+ if (scorer != null && scorer.getRecommendationServiceLabel() != null) {
+ String format = context.getString(R.string.connected_via_network_scorer);
+ return String.format(format, scorer.getRecommendationServiceLabel());
+ } else {
+ return context.getString(R.string.connected_via_network_scorer_default);
+ }
}
}