Findbug fixes in Settings app

modified:   src/com/android/settings/ApnPreference.java
	modified:   src/com/android/settings/ApnSettings.java
	modified:   src/com/android/settings/BandMode.java
	modified:   src/com/android/settings/BatteryInfo.java
	modified:   src/com/android/settings/LanguageSettings.java
	modified:   src/com/android/settings/ManageApplications.java
	modified:   src/com/android/settings/RadioInfo.java
	modified:   src/com/android/settings/SdCardSettings.java
	modified:   src/com/android/settings/UsageStats.java
	modified:   src/com/android/settings/ZoneList.java
	modified:   src/com/android/settings/bluetooth/LocalBluetoothDevice.java
	modified:   src/com/android/settings/deviceinfo/Status.java
	modified:   src/com/android/settings/quicklaunch/QuickLaunchSettings.java
	modified:   src/com/android/settings/wifi/AccessPointDialog.java
	modified:   src/com/android/settings/wifi/AccessPointPreference.java
	modified:   src/com/android/settings/wifi/WifiLayer.java
	modified:   src/com/android/settings/wifi/WifiSettings.java

src/com/android/settings/wifi/AccessPointDialog.java

@@ -321,12 +321,12 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On
     }
 
     private void updatePasswordCaption(String security) {
-        
-        if (mPasswordText != null && security != null
-                && security.equals(AccessPointState.WEP)) {
-            mPasswordText.setText(R.string.please_type_hex_key);
-        } else {
-            mPasswordText.setText(R.string.please_type_passphrase);
+        if (mPasswordText != null) {
+            if (security != null && security.equals(AccessPointState.WEP)) {
+                mPasswordText.setText(R.string.please_type_hex_key);
+            } else {
+                mPasswordText.setText(R.string.please_type_passphrase);
+            }
         }
     }
     

src/com/android/settings/wifi/AccessPointPreference.java

@@ -33,14 +33,11 @@ public class AccessPointPreference extends Preference implements
     // Signal strength indicator
     private static final int UI_SIGNAL_LEVELS = 4;
 
-    private WifiSettings mWifiSettings;
-    
     private AccessPointState mState;
 
     public AccessPointPreference(WifiSettings wifiSettings, AccessPointState state) {
         super(wifiSettings, null);
         
-        mWifiSettings = wifiSettings;
         mState = state;
         
         setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);

src/com/android/settings/wifi/WifiLayer.java

@@ -763,7 +763,9 @@ public class WifiLayer {
              * We pass null for security since we have a network ID (i.e., it's
              * not a wildcard), and rely on it matching.
              */
-            return findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), ssid, null);
+            synchronized (this) {
+                return findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), ssid, null);
+            }
         } else {
             return null;
         }
@@ -1002,8 +1004,10 @@ public class WifiLayer {
              * We pass null for security since we have a network ID (i.e., it's
              * not a wildcard), and rely on it matching.
              */
-            ap = findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), wifiInfo
-                    .getSSID(), null);
+            synchronized (this) {
+                ap = findApLocked(wifiInfo.getNetworkId(), wifiInfo.getBSSID(), wifiInfo
+                        .getSSID(), null);
+            }
         }
 
         if (ap != null) {

src/com/android/settings/wifi/WifiSettings.java

@@ -365,8 +365,8 @@ public class WifiSettings extends PreferenceActivity implements WifiLayer.Callba
         }
         
         mDialog = dialog;
-        dialog.setOnDismissListener(this);
         if (dialog != null) {
+            dialog.setOnDismissListener(this);
             dialog.show();
         }
     }