diff options
| author | Ningyuan Wang <nywang@google.com> | 2016-05-10 15:31:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-10 15:31:44 +0000 |
| commit | 208c3c19bae4801f7e18c44e1ce2b6e06dd19d05 (patch) | |
| tree | 669ccfe1bd5c314f3a7b23ca4fd62dfd53e001a5 /service/java/com/android/server/wifi/WifiConfigManager.java | |
| parent | b53cd9aa2625ec2a1c2e69c609d8a9dda3569a36 (diff) | |
| parent | b2c2f85c959cb0deba238b566f39b1b942eb70a8 (diff) | |
| download | android_frameworks_opt_net_wifi-208c3c19bae4801f7e18c44e1ce2b6e06dd19d05.tar.gz android_frameworks_opt_net_wifi-208c3c19bae4801f7e18c44e1ce2b6e06dd19d05.tar.bz2 android_frameworks_opt_net_wifi-208c3c19bae4801f7e18c44e1ce2b6e06dd19d05.zip | |
Merge "Fix string comparision and return value in try catch block" into nyc-dev
Diffstat (limited to 'service/java/com/android/server/wifi/WifiConfigManager.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 424a2318e..de4ec1f31 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -2182,7 +2182,7 @@ public class WifiConfigManager { if (originalConfig.wepKeys != null && currentConfig.wepKeys != null) { if (originalConfig.wepKeys.length == currentConfig.wepKeys.length) { for (int i = 0; i < originalConfig.wepKeys.length; i++) { - if (originalConfig.wepKeys[i] != currentConfig.wepKeys[i]) { + if (!Objects.equals(originalConfig.wepKeys[i], currentConfig.wepKeys[i])) { return true; } } |