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

Commit 2f83bdec authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException for WifiDisplayController." into main am:... 

Merge "Fix NullPointerException for WifiDisplayController." into main am: b8e8e73b am: 892743b8 am: f322f5ad

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2632969



Change-Id: I4da37fb6fdc2edc1a62d5057024a5d6952c46a3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4bc3d306 f322f5ad

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

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



    private static WifiDisplay createWifiDisplay(WifiP2pDevice device) {

        WifiP2pWfdInfo wfdInfo = device.getWfdInfo();

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

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

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

                true, isSessionAvailable, false);

    }



    private final BroadcastReceiver mWifiP2pReceiver = new BroadcastReceiver() {