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

Commit bfad6e62 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "p2p: Display P2P peer MAC address if device name is empty." into cm-11.0

parents 1aafb287 cb6230c9

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

+4 −1
Original line number Diff line number Diff line
@@ -2185,7 +2185,6 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
        ViewGroup group = (ViewGroup) textEntryView.findViewById(R.id.info);

        addRowToDialog(group, R.string.wifi_p2p_from_message, getDeviceName(

                mSavedPeerConfig.deviceAddress));



        final EditText pin = (EditText) textEntryView.findViewById(R.id.wifi_p2p_wps_pin);



        AlertDialog dialog = new AlertDialog.Builder(mContext)
@@ -2537,6 +2536,10 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
    private String getDeviceName(String deviceAddress) {

        WifiP2pDevice d = mPeers.get(deviceAddress);

        if (d != null) {

                String deviceName = d.deviceName;

                if (deviceName.equals("")) {

                    return deviceAddress;

                }

                return d.deviceName;

        }

        //Treat the address as name if there is no match