Handle null SSID cleanly

Bug: 6411912
Change-Id: I12f9df403c9633d928d898ae675ce36303dda1a8

2 files changed, 9 insertions, 6 deletions

diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java
index f873b6c..5255647 100644
--- a/services/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/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();
+                        }
                     }
                 }
             }
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 30e4a20..1f1cfdd 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/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);