Merge "Use CONFIG_CTRL_IFACE_AIDL instead of ANDROID" am: 98ce42b5de am: 9817f48858
Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/2315621
Change-Id: I53e3d6126ada8f13800418938dcc8307bf96862a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index f871b9e..ccf945d 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -5385,14 +5385,14 @@
wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
interface_count = 0;
}
-#ifndef ANDROID
+#ifndef CONFIG_CTRL_IFACE_AIDL
if (!wpa_s->p2p_mgmt &&
wpa_supplicant_delayed_sched_scan(wpa_s,
interface_count % 3,
100000))
wpa_supplicant_req_scan(wpa_s, interface_count % 3,
100000);
-#endif /* ANDROID */
+#endif /* CONFIG_CTRL_IFACE_AIDL */
interface_count++;
} else
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);