diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-12-11 22:18:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-11 22:18:37 +0000 |
| commit | ca98d25affbc5bc948bf1f9a597a346cf347f27a (patch) | |
| tree | 0d57d400ac4ca8f731928e32463a545aa59081a0 /service | |
| parent | 93a1fddee50a244d31036cddae6b7db6630fd93d (diff) | |
| parent | 84befe36af491f26ae46243017a1aca4dd5b24d5 (diff) | |
| download | android_frameworks_opt_net_wifi-ca98d25affbc5bc948bf1f9a597a346cf347f27a.tar.gz android_frameworks_opt_net_wifi-ca98d25affbc5bc948bf1f9a597a346cf347f27a.tar.bz2 android_frameworks_opt_net_wifi-ca98d25affbc5bc948bf1f9a597a346cf347f27a.zip | |
Merge "Fix an unhandled exception in WifiP2pStateMachine" into lmp-mr1-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java index e5ed6906e..1c04e4386 100644 --- a/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java +++ b/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java @@ -2745,7 +2745,7 @@ public final class WifiP2pServiceImpl extends IWifiP2pManager.Stub { // Remove only the peer we failed to connect to so that other devices discovered // that have not timed out still remain in list for connection boolean peersChanged = mPeers.remove(mPeersLostDuringConnection); - if (mSavedPeerConfig.deviceAddress != null && + if (TextUtils.isEmpty(mSavedPeerConfig.deviceAddress) == false && mPeers.remove(mSavedPeerConfig.deviceAddress) != null) { peersChanged = true; } |