diff options
| author | Roshan Pius <rpius@google.com> | 2017-04-13 02:56:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-13 02:56:45 +0000 |
| commit | c05f9c79177ef3cc7e5f86b176e40440412dc592 (patch) | |
| tree | 4a4e12f3825053144df09e0e6573d82edca16311 /service | |
| parent | 231b0fbec4be64c4651566c54560fd57ec8b0290 (diff) | |
| parent | 676815948d9ce6adf17b8c28574712b4c382a8ac (diff) | |
Merge changes Ie40bfecf,I26352317 into oc-dev am: 6abf3c0c86
am: 676815948d
Change-Id: I479142c59b303afa062abf3fd9b5ce42f9b4b617
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/SupplicantStaIfaceHal.java | 6 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceCallback.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java index f21c75490..9c9501b3b 100644 --- a/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java +++ b/service/java/com/android/server/wifi/SupplicantStaIfaceHal.java @@ -1841,13 +1841,13 @@ public class SupplicantStaIfaceHal { WifiSsid wifiSsid = WifiSsid.createFromByteArray(NativeUtil.byteArrayFromArrayList(ssid)); String bssidStr = NativeUtil.macAddressFromByteArray(bssid); - mWifiMonitor.broadcastSupplicantStateChangeEvent( - mIfaceName, mFrameworkNetworkId, wifiSsid, bssidStr, newSupplicantState); + mStateIsFourway = (newState == ISupplicantStaIfaceCallback.State.FOURWAY_HANDSHAKE); if (newSupplicantState == SupplicantState.COMPLETED) { mWifiMonitor.broadcastNetworkConnectionEvent( mIfaceName, mFrameworkNetworkId, bssidStr); } - mStateIsFourway = (newState == ISupplicantStaIfaceCallback.State.FOURWAY_HANDSHAKE); + mWifiMonitor.broadcastSupplicantStateChangeEvent( + mIfaceName, mFrameworkNetworkId, wifiSsid, bssidStr, newSupplicantState); } } diff --git a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceCallback.java b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceCallback.java index 836898d7f..5f4cb1773 100644 --- a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceCallback.java +++ b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceCallback.java @@ -271,7 +271,8 @@ public class SupplicantP2pIfaceCallback extends ISupplicantP2pIfaceCallback.Stub group.setInterface(groupIfName); try { - group.setNetworkName(NativeUtil.encodeSsid(ssid)); + String quotedSsid = NativeUtil.encodeSsid(ssid); + group.setNetworkName(NativeUtil.removeEnclosingQuotes(quotedSsid)); } catch (Exception e) { Log.e(TAG, "Could not encode SSID.", e); return; |