update to duco/rk 3128-6003-6.0

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

@@ -5302,6 +5302,16 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             Log.d(TAG, "SoftAp config channel is: " + config.apChannel);
         }
 
+	if (true) { // simple wifi ap channel select
+            boolean dualBand = mContext.getResources().getBoolean(com.android.internal.R.bool.config_wifi_dual_band_support);
+            //Log.d(TAG, "dualBand = " + dualBand + ", apBand = " + config.apBand);
+            if (dualBand && config.apBand != 0) {
+                config.apChannel = 153;
+            } else {
+                config.apChannel = 6;
+            }
+            Log.d(TAG, "SoftAp config channel is: " + config.apChannel);
+	} else {
         //We need HAL support to set country code and get available channel list, if HAL is
         //not available, like razor, we regress to original implementaion (2GHz, channel 6)
         if (mWifiNative.isHalStarted()) {
@@ -5346,6 +5356,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             config.apBand = 0;
             config.apChannel = 6;
         }
+	}
         // Start hostapd on a separate thread
         new Thread(new Runnable() {
             public void run() {
@@ -5996,7 +6007,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             initializeCountryCode();
 
             setRandomMacOui();
-            mWifiNative.enableAutoConnect(false);
+            mWifiNative.enableAutoConnect(true);
         }
 
         @Override
@@ -8210,7 +8221,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             // cause the roam to faile and the device to disconnect
             clearCurrentConfigBSSID("L2ConnectedState");
 
-            try {
+            // temporary disable IpReachabilityMonitor(may cause wifi disconnect problem), huweiguo
+            mIpReachabilityMonitor = null;
+            /*try {
                 mIpReachabilityMonitor = new IpReachabilityMonitor(
                         mContext,
                         mInterfaceName,
@@ -8222,7 +8235,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                         });
             } catch (IllegalArgumentException e) {
                 Log.wtf("Failed to create IpReachabilityMonitor", e);
-            }
+            }*/
         }
 
         @Override