Merge "Fix NPE in WriteWifiConfigToNfcDialog."

This commit is contained in:
TreeHugger Robot
2017-02-16 20:26:39 +00:00
committed by Android (Google) Code Review
3 changed files with 159 additions and 1 deletions

View File

@@ -145,7 +145,7 @@ class WriteWifiConfigToNfcDialog extends AlertDialog
passwordHex = String.format(PASSWORD_FORMAT, passwordLength, passwordHex).toUpperCase();
if (wpsNfcConfigurationToken.contains(passwordHex)) {
if (wpsNfcConfigurationToken != null && wpsNfcConfigurationToken.contains(passwordHex)) {
mWpsNfcConfigurationToken = wpsNfcConfigurationToken;
Activity activity = getOwnerActivity();