diff options
| author | Amin Shaikh <ashaikh@google.com> | 2017-02-15 17:47:04 -0800 |
|---|---|---|
| committer | Amin Shaikh <ashaikh@google.com> | 2017-02-16 10:34:36 -0800 |
| commit | 5bac36a15a3e9b163784db53283e9806b6f18e3e (patch) | |
| tree | 4cddea9885dcefa3410d8596d42579e9fc4d26c6 /src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java | |
| parent | b6fcba73e7e689c8a4e6db1888888c7e490d0454 (diff) | |
| download | packages_apps_Settings-5bac36a15a3e9b163784db53283e9806b6f18e3e.tar.gz packages_apps_Settings-5bac36a15a3e9b163784db53283e9806b6f18e3e.tar.bz2 packages_apps_Settings-5bac36a15a3e9b163784db53283e9806b6f18e3e.zip | |
Fix NPE in WriteWifiConfigToNfcDialog.
Bug: 34691792
Test: m RunSettingsRoboTests
Change-Id: I0e396f4f590c8de6636c7494e20d74c562b7c9cd
Diffstat (limited to 'src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java')
| -rw-r--r-- | src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java index 00b2446293..0d3f3b6c1d 100644 --- a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java +++ b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java @@ -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(); |