summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/WifiConfiguration.java
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-04-24 14:02:45 -0700
committerEtan Cohen <etancohen@google.com>2015-04-24 14:02:45 -0700
commit4de834eb636a46db223417a03646751eb06efe66 (patch)
tree0bf66439f92b7ec2d22588185433849aac81cead /wifi/java/android/net/wifi/WifiConfiguration.java
parent5a63f39171caa4ea411787bbd57aff0a92f58277 (diff)
parentc91bc62f2bdca18c0ed96a740cbaa0383ea2860a (diff)
downloadframeworks_base-4de834eb636a46db223417a03646751eb06efe66.zip
frameworks_base-4de834eb636a46db223417a03646751eb06efe66.tar.gz
frameworks_base-4de834eb636a46db223417a03646751eb06efe66.tar.bz2
Merge commit 'c91bc62' into merge2
Diffstat (limited to 'wifi/java/android/net/wifi/WifiConfiguration.java')
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index c6f2991..802e0d2 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -953,7 +953,7 @@ public class WifiConfiguration implements Parcelable {
if (!TextUtils.isEmpty(FQDN)) {
/* this is passpoint configuration; it must not have an SSID */
if (!TextUtils.isEmpty(SSID)) {
- return "no SSID";
+ return "SSID not expected for Passpoint: '" + SSID + "'";
}
/* this is passpoint configuration; it must have a providerFriendlyName */
if (TextUtils.isEmpty(providerFriendlyName)) {