commit 4463829319ccee22c8881eb61cd7dcd3c7b9e135
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 18 23:24:19 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 18 23:24:19 2022 +0000
tree 0cce0ca6a3b0596a1f4c327daedfcfa975d154cb
parent 696010b0c5f90628c9aadfffb19699fbab34ea3a
parent bbb9db41499d3cd37aa2f13b239bbafa7f5c507b

Merge "Add null check for mChannel object in WifiP2Settings" am: 2f4962c862 am: 0b28adfd8e am: bbb9db4149

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2030626

Change-Id: Ibe6ef9677e7892448000bb2d83501258dacd57d9

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 404cdd3..5128682 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -353,6 +353,7 @@
             mWifiP2pManager.requestDeviceInfo(mChannel, WifiP2pSettings.this);
             mIsIgnoreInitConnectionInfoCallback = false;
             mWifiP2pManager.requestNetworkInfo(mChannel, networkInfo -> {
+                if (mChannel == null) return;
                 mWifiP2pManager.requestConnectionInfo(mChannel, wifip2pinfo -> {
                     if (!mIsIgnoreInitConnectionInfoCallback) {
                         if (networkInfo.isConnected()) {