diff options
| author | Hai Shalom <haishalom@google.com> | 2019-04-30 14:45:55 -0700 |
|---|---|---|
| committer | Hai Shalom <haishalom@google.com> | 2019-04-30 14:45:55 -0700 |
| commit | c4809957e763a1a73f7d813561b3a987fc720ccb (patch) | |
| tree | 5c5b1473e8435bc8935c4c1459e16e8c994b9ddb | |
| parent | 200b74922ba9c9147812b97b8d1defe9b92049ba (diff) | |
| download | wpa_supplicant_8-c4809957e763a1a73f7d813561b3a987fc720ccb.tar.gz | |
[wpa_supplicant] Fix merge error that broke VtsHalWifiSupplicantP2pV1_0Target
Fix merge error in notify.c that broke VTS test case
VtsHalWifiSupplicantP2pV1_0Target. Revert the code, and remove code
related to old dbus interface which has been removed from the upstream
version.
Bug: 131376215
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalWifiSupplicantP2pV1_0Target
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalWifiSupplicantV1_0Host
Change-Id: I8248ebb3d7b66a2584408b74bc3ac6bba6877a6e
| -rw-r--r-- | wpa_supplicant/notify.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index bd4b8ae2..41dc3341 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -60,30 +60,28 @@ void wpas_notify_supplicant_deinitialized(struct wpa_global *global) int wpas_notify_iface_added(struct wpa_supplicant *wpa_s) { - if (wpa_s->p2p_mgmt) - return 0; + if (!wpa_s->p2p_mgmt) { + if (wpas_dbus_register_interface(wpa_s)) + return -1; + } /* HIDL interface wants to keep track of the P2P mgmt iface. */ if (wpas_hidl_register_interface(wpa_s)) return -1; - if (wpas_dbus_register_interface(wpa_s)) - return -1; - return 0; } void wpas_notify_iface_removed(struct wpa_supplicant *wpa_s) { - if (wpa_s->p2p_mgmt) - return; + if (!wpa_s->p2p_mgmt) { + /* unregister interface in new DBus ctrl iface */ + wpas_dbus_unregister_interface(wpa_s); + } /* HIDL interface wants to keep track of the P2P mgmt iface. */ wpas_hidl_unregister_interface(wpa_s); - - /* unregister interface in new DBus ctrl iface */ - wpas_dbus_unregister_interface(wpa_s); } |