diff options
| author | 2023-08-29 12:03:23 +0000 | |
|---|---|---|
| committer | 2023-08-29 12:03:23 +0000 | |
| commit | 892743b87bd35617470bbb5ffa3cb9f5cdf6af6e (patch) | |
| tree | bc3da03e98b193295bf8044405f2b171b5e26dda | |
| parent | 2d68ef25ec037f668d994369faf40eaaef03ebff (diff) | |
| parent | b8e8e73b2232b47df353d69fb2b972b8d5c8a006 (diff) | |
Merge "Fix NullPointerException for WifiDisplayController." into main am: b8e8e73b22
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2632969
Change-Id: I82742682e684e5bd191f81992f01ba601afb6ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/display/WifiDisplayController.java | 4 |
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 f6d06aa2fec0..955b8d95fd87 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() { |