Check for null inputs in the ctor.

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.wifi.WifiHostTest
Bug: 35152108
Change-Id: I321b52b0feb62aced20bca7f47e962f5c7d78343
This commit is contained in:
Jeremy Joslin
2017-02-08 14:50:34 -08:00
parent 7c810edbce
commit e925aeacab

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;