Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83a708e6 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Handle null SSID cleanly" into jb-dev

parents 47f88d6b 00a10a14

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

+8 −6
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            if (reason == CHANGE_REASON_REMOVED) {

                final WifiConfiguration config = intent.getParcelableExtra(

                        EXTRA_WIFI_CONFIGURATION);

                if (config.SSID != null) {

                    final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(

                            removeDoubleQuotes(config.SSID));

                    synchronized (mRulesLock) {
@@ -510,6 +511,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                    }

                }

            }

        }

    };



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -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);