commit ee011948b79015df2ba7e7a2380098b0e222bfa8
author Connor O'Brien <connoro@google.com> Mon Oct 22 16:01:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 22 16:01:38 2018 -0700
tree 33f1c5f7752a77244c6d285ede52eedfda4748a5
parent 48a2ebbe1f1dde823f7bf61b5bc968d826d3cf21
parent e14e593d8fbeb2dcc3719e86bfa28bc0e3f1f585

Merge "Add statically linked boot HAL impl in recovery"
am: e14e593d8f

Change-Id: I03d46c8b8b17a64cb794449e6c7fa2a2f7b7b7e2

wifi/1.2/default/Android.mk

diff --git a/wifi/1.2/default/Android.mk b/wifi/1.2/default/Android.mk
index 3c26383..3919690 100644
--- a/wifi/1.2/default/Android.mk
+++ b/wifi/1.2/default/Android.mk
@@ -30,8 +30,6 @@
 ifdef WIFI_HIDL_FEATURE_DISABLE_AP
 LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_DISABLE_AP
 endif
-# Allow implicit fallthroughs in wifi_legacy_hal.cpp until they are fixed.
-LOCAL_CFLAGS += -Wno-error=implicit-fallthrough
 LOCAL_SRC_FILES := \
     hidl_struct_util.cpp \
     hidl_sync_util.cpp \

wifi/1.2/default/wifi_legacy_hal.cpp

diff --git a/wifi/1.2/default/wifi_legacy_hal.cpp b/wifi/1.2/default/wifi_legacy_hal.cpp
index 55ec96d..375204c 100644
--- a/wifi/1.2/default/wifi_legacy_hal.cpp
+++ b/wifi/1.2/default/wifi_legacy_hal.cpp
@@ -550,7 +550,6 @@
                 }
                 // Fall through if failed. Failure to retrieve cached scan
                 // results should trigger a background scan failure.
-                [[fallthrough]];
                 case WIFI_SCAN_FAILED:
                     on_failure_user_callback(id);
                     on_gscan_event_internal_callback = nullptr;