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

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

Merge "Fix concurrency issues" into jb-mr2-dev

parents 35cd94ab ab3b9fbf

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

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ public class WifiP2pDevice implements Parcelable { 
            deviceCapability = source.deviceCapability;

            groupCapability = source.groupCapability;

            status = source.status;

            wfdInfo = source.wfdInfo;

            wfdInfo = new WifiP2pWfdInfo(source.wfdInfo);

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class WifiP2pDeviceList implements Parcelable { 
    public WifiP2pDeviceList(WifiP2pDeviceList source) {

        if (source != null) {

            for (WifiP2pDevice d : source.getDeviceList()) {

                mDevices.put(d.deviceAddress, d);

                mDevices.put(d.deviceAddress, new WifiP2pDevice(d));

            }

        }

    }
@@ -53,7 +53,7 @@ public class WifiP2pDeviceList implements Parcelable { 
    public WifiP2pDeviceList(ArrayList<WifiP2pDevice> devices) {

        for (WifiP2pDevice device : devices) {

            if (device.deviceAddress != null) {

                mDevices.put(device.deviceAddress, device);

                mDevices.put(device.deviceAddress, new WifiP2pDevice(device));

            }

        }

    }

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+1 −1
Original line number Diff line number Diff line
@@ -1839,7 +1839,7 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 


    private void sendPeersChangedBroadcast() {

        final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);

        intent.putExtra(WifiP2pManager.EXTRA_P2P_DEVICE_LIST, mPeers);

        intent.putExtra(WifiP2pManager.EXTRA_P2P_DEVICE_LIST, new WifiP2pDeviceList(mPeers));

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mContext.sendBroadcastAsUser(intent, UserHandle.ALL);

    }