diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-25 02:13:54 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-12-25 02:13:54 +0000 |
| commit | 6a4f8b44e5eb76585dae6e4cf3ce70c5309f2672 (patch) | |
| tree | c1d1a7b19896d18ca3df54e2d34613850104a5b6 | |
| parent | 5382002c37d7d82f1be6c74928dcc5d76d89590d (diff) | |
| parent | b6aaecce75ee949b03da891a6a0c4ad382f7b4ee (diff) | |
| download | wpa_supplicant_8-6a4f8b44e5eb76585dae6e4cf3ce70c5309f2672.tar.gz | |
Snap for 6096803 from b6aaecce75ee949b03da891a6a0c4ad382f7b4ee to qt-qpr2-releaseandroid-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-release
Change-Id: I43b6ba140f6273bf955d42f6bd595828a343fef2
| -rw-r--r-- | wpa_supplicant/hidl/1.2/p2p_iface.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wpa_supplicant/hidl/1.2/p2p_iface.cpp b/wpa_supplicant/hidl/1.2/p2p_iface.cpp index 0a6b657d..fd9ce0dc 100644 --- a/wpa_supplicant/hidl/1.2/p2p_iface.cpp +++ b/wpa_supplicant/hidl/1.2/p2p_iface.cpp @@ -225,7 +225,7 @@ int joinScanReq( size_t ielen; unsigned int bands; - if (!wpa_s->global->p2p) { + if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled) { wpa_printf(MSG_ERROR, "P2P: P2P interface is gone, cancel join scan"); return -ENXIO; @@ -1634,7 +1634,7 @@ SupplicantStatus P2pIface::addGroup_1_2Internal( int vht = wpa_s->conf->p2p_go_vht; int ht40 = wpa_s->conf->p2p_go_ht40 || vht; - if (wpa_s->global->p2p == NULL) { + if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled) { return {SupplicantStatusCode::FAILURE_IFACE_DISABLED, ""}; } @@ -1691,6 +1691,9 @@ SupplicantStatus P2pIface::addGroup_1_2Internal( pending_join_scan_callback = [wpa_s, ssid, freq]() { + if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled) { + return; + } int ret = joinScanReq(wpa_s, ssid, freq); // for BUSY case, the scan might be occupied by WiFi. // Do not give up immediately, but try again later. @@ -1707,7 +1710,7 @@ SupplicantStatus P2pIface::addGroup_1_2Internal( }; pending_scan_res_join_callback = [wpa_s, ssid, passphrase, peer_address, this]() { - if (wpa_s->global->p2p_disabled) { + if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled) { return; } |