summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Piotr WilczyƄski <wilczynskip@google.com> 2023-08-29 11:36:17 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-08-29 11:36:17 +0000
commitb8e8e73b2232b47df353d69fb2b972b8d5c8a006 (patch)
treec0e4e8306f01311d7b41d6d6f998526edb75d9bd
parent942d47b019852409865ee53a189b09cc0743dff1 (diff)
parent23bdc16c3b85640f000af3587e34d7ffb93f4123 (diff)
Merge "Fix NullPointerException for WifiDisplayController." into main
-rw-r--r--services/core/java/com/android/server/display/WifiDisplayController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/WifiDisplayController.java b/services/core/java/com/android/server/display/WifiDisplayController.java
index cd36dd02a8c6..04ae13f2e2cc 100644
--- a/services/core/java/com/android/server/display/WifiDisplayController.java
+++ b/services/core/java/com/android/server/display/WifiDisplayController.java
@@ -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() {