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

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

Merge "Fix device list update" into jb-mr1-dev

parents 41bd89f6 e298d884

wifi/java/android/net/wifi/p2p/WifiP2pDevice.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ public class WifiP2pDevice implements Parcelable { 
        "config_methods=(0x[0-9a-fA-F]+) " +

        "config_methods=(0x[0-9a-fA-F]+) " +

        "dev_capab=(0x[0-9a-fA-F]+) " +

        "dev_capab=(0x[0-9a-fA-F]+) " +

        "group_capab=(0x[0-9a-fA-F]+)" +

        "group_capab=(0x[0-9a-fA-F]+)" +

        "( wfd_dev_info=000006([0-9a-fA-F]+))?"

        "( wfd_dev_info=0x000006([0-9a-fA-F]{12}))?"

    );

    );





    /** 2 token device address pattern

    /** 2 token device address pattern

wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ public class WifiP2pDeviceList implements Parcelable { 
            d.wpsConfigMethodsSupported = device.wpsConfigMethodsSupported;

            d.wpsConfigMethodsSupported = device.wpsConfigMethodsSupported;

            d.deviceCapability = device.deviceCapability;

            d.deviceCapability = device.deviceCapability;

            d.groupCapability = device.groupCapability;

            d.groupCapability = device.groupCapability;

            d.wfdInfo = device.wfdInfo;

            return;

            return;

        }

        }

        //Not found, add a new one

        //Not found, add a new one