Merge "Wi-Fi: Pass default country code to driver" into cm-10.1

Author: maniac103

wifi/java/android/net/wifi/WifiNative.java

@@ -360,10 +360,6 @@ public boolean setSuspendOptimizations(boolean enabled) {
     }
 
     public boolean setCountryCode(String countryCode) {
-        if (countryCode == null) {
-            // Ping the driver
-            return doBooleanCommand("DRIVER COUNTRY");
-        }
         return doBooleanCommand("DRIVER COUNTRY " + countryCode);
     }
 

wifi/java/android/net/wifi/WifiStateMachine.java

@@ -1347,14 +1347,14 @@ private void setCountryCode() {
             setCountryCode(countryCode, false);
         } else {
             // On wifi-only devices, some drivers don't find hidden SSIDs unless DRIVER COUNTRY
-            // is called. Pinging the wifi driver without country code resolves this issue.
+            // is called. Use the default country code to ping the driver.
             ConnectivityManager cm =
                     (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (!cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
-                setCountryCode(null, false);
+                setCountryCode(mCountryCode, false);
             }
 
-            // In other case, mmc tables from carrier do the trick of starting up the wifi driver
+            // In other case, mcc tables from carrier do the trick of starting up the wifi driver
         }
     }
 
@@ -2811,14 +2811,12 @@ public boolean processMessage(Message message) {
                     break;
                 case CMD_SET_COUNTRY_CODE:
                     String country = (String) message.obj;
-                    if (DBG) log("set country code " + country);
                     String countryCode = country != null ? country.toUpperCase() : null;
+                    if (DBG) log("set country code " + countryCode);
                     if (mWifiNative.setCountryCode(countryCode)) {
-                        if (countryCode != null) {
-                            mCountryCode = countryCode;
-                        }
+                        mCountryCode = countryCode;
                     } else {
-                        loge("Failed to set country code " + country);
+                        loge("Failed to set country code " + countryCode);
                     }
                     break;
                 case CMD_SET_FREQUENCY_BAND: