Merge changes Ie40bfecf,I26352317 into oc-dev

am: 6abf3c0c86

Change-Id: Ie020bfb9558f4d234f293121cecc47562a4e8790

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;