commit f47012d53a05a9da38bb2239ec3411968c36117f
author Linux Build Service Account <lnxbuild@localhost> Wed May 19 01:41:53 2021 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed May 19 01:41:53 2021 -0700
tree 839936e8b921ddf3357129ae060acdb6eb0a436d
parent e112d8666aedd66aaa7728c7f105c3894be1800f
parent e751b59059150ec3ebc7da69163ce175712ecfee

Merge e751b59059150ec3ebc7da69163ce175712ecfee on remote branch

Change-Id: I8bbf0b420515b90015134ae1363bd799387dba2a

service/java/com/android/server/wifi/WifiNative.java

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 5e2c27a..ea27d19 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -3060,14 +3060,14 @@
                         }
                         //wifigbk++
                         if (!WifiGbk.isAllAscii(nativeNetwork.getSsid())) {
-                            android.net.wifi.nl80211.PnoNetwork nativeNetwork2 =
-                                new android.net.wifi.nl80211.PnoNetwork();
-                            nativeNetwork2.setHidden(nativeNetwork.isHidden());
-                            nativeNetwork2.setSsid(WifiGbk.toGbk(nativeNetwork.getSsid()));
-                            nativeNetwork2.setFrequenciesMhz(nativeNetwork.getFrequenciesMhz());
-                            if (nativeNetwork2.getSsid() != null) {
-                                pnoNetworks.add(nativeNetwork2);
-                                Log.i(TAG, "WifiGbk fixed - pnoScan add extra Gbk ssid for " + nativeNetwork.getSsid());
+                            byte gbkBytes[] = WifiGbk.toGbk(nativeNetwork.getSsid());
+                            if (gbkBytes != null) {
+                                android.net.wifi.nl80211.PnoNetwork gbkNetwork =
+                                    network.toNativePnoNetwork();
+                                gbkNetwork.setSsid(gbkBytes);
+                                pnoNetworks.add(gbkNetwork);
+                                Log.i(TAG, "WifiGbk fixed - pnoScan add extra Gbk ssid for "
+                                      + nativeNetwork.getSsid());
                             }
                         }
                         //wifigbk--