Merge "Handle null SSID cleanly" into jb-dev

services/java/com/android/server/net/NetworkPolicyManagerService.java

@@ -500,12 +500,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
             if (reason == CHANGE_REASON_REMOVED) {
                 final WifiConfiguration config = intent.getParcelableExtra(
                         EXTRA_WIFI_CONFIGURATION);
-                final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
-                        removeDoubleQuotes(config.SSID));
-                synchronized (mRulesLock) {
-                    if (mNetworkPolicy.containsKey(template)) {
-                        mNetworkPolicy.remove(template);
-                        writePolicyLocked();
+                if (config.SSID != null) {
+                    final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
+                            removeDoubleQuotes(config.SSID));
+                    synchronized (mRulesLock) {
+                        if (mNetworkPolicy.containsKey(template)) {
+                            mNetworkPolicy.remove(template);
+                            writePolicyLocked();
+                        }
                     }
                 }
             }

wifi/java/android/net/wifi/WifiInfo.java

@@ -266,6 +266,7 @@ public class WifiInfo implements Parcelable {
 
     /** {@hide} */
     public static String removeDoubleQuotes(String string) {
+        if (string == null) return null;
         final int length = string.length();
         if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) {
             return string.substring(1, length - 1);