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

Commit 23bdc16c authored by jiayongqiang's avatar jiayongqiang Committed by yongqiang jia
Browse files

Fix NullPointerException for WifiDisplayController. 



Set WifiDisplay to unavailable if p2p device is unavailable,
because the approach of WifiP2pWfdInfo.getWfdInfo() maybe return null,
so we need to do a non-null check to ensure the NPE issue will not
happen.

Bug: 297799091

Test: atest FrameworksWifiApiTests

Change-Id: I06e77719e646a28cc40e1e3d7c45b4f3c9472673
Signed-off-by: default avatarjiayongqiang <jiayongqiang@xiaomi.com>
parent 933a0c09

services/core/java/com/android/server/display/WifiDisplayController.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -1062,8 +1062,10 @@ final class WifiDisplayController implements DumpUtils.Dump { 
    }

    }





    private static WifiDisplay createWifiDisplay(WifiP2pDevice device) {

    private static WifiDisplay createWifiDisplay(WifiP2pDevice device) {

        WifiP2pWfdInfo wfdInfo = device.getWfdInfo();

        boolean isSessionAvailable = wfdInfo != null && wfdInfo.isSessionAvailable();

        return new WifiDisplay(device.deviceAddress, device.deviceName, null,

        return new WifiDisplay(device.deviceAddress, device.deviceName, null,

                true, device.getWfdInfo().isSessionAvailable(), false);

                true, isSessionAvailable, false);

    }

    }





    private final BroadcastReceiver mWifiP2pReceiver = new BroadcastReceiver() {

    private final BroadcastReceiver mWifiP2pReceiver = new BroadcastReceiver() {