Merge "Check P2P channel before requesting network info" into udc-qpr-dev

2023-06-30 14:48:12 +00:00
parent c156b6c427 36d71f8785
commit dc98948cc1
2 changed files with 11 additions and 0 deletions
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -617,6 +617,9 @@ public class WifiP2pSettings extends DashboardFragment
    }

    private void onDeviceAvailable() {
+        if (mWifiP2pManager == null || sChannel == null) {
+            return;
+        }
        mWifiP2pManager.requestNetworkInfo(sChannel, networkInfo -> {
            if (sChannel == null) return;
            mWifiP2pManager.requestConnectionInfo(sChannel, wifip2pinfo -> {