Merge "Check for null inputs in the ctor."

This commit is contained in:
TreeHugger Robot
2017-02-09 00:25:23 +00:00
committed by Android (Google) Code Review

View File

@@ -64,10 +64,10 @@ public class WifiKey implements Parcelable {
* @throws IllegalArgumentException if either the SSID or BSSID is invalid.
*/
public WifiKey(String ssid, String bssid) {
if (!SSID_PATTERN.matcher(ssid).matches()) {
if (ssid == null || !SSID_PATTERN.matcher(ssid).matches()) {
throw new IllegalArgumentException("Invalid ssid: " + ssid);
}
if (!BSSID_PATTERN.matcher(bssid).matches()) {
if (bssid == null || !BSSID_PATTERN.matcher(bssid).matches()) {
throw new IllegalArgumentException("Invalid bssid: " + bssid);
}
this.ssid = ssid;