commit 4918aa86d4a6806c6849b1f2677849633c27e211
author Ningyuan Wang <nywang@google.com> Mon Mar 20 17:40:36 2017 +0000
committer Ningyuan Wang <nywang@google.com> Mon Mar 20 20:32:04 2017 +0000
tree 5e77dcd975749f10b33523daa486a15461dd940d
parent 98d17f09680a687cdba787824259ff650691560f

Revert "Do not report scan aborted event"

SCAN_FAILED event should not be blamed for b/36231150 after investigation. Revert this change.

This reverts commit 7334e2f90be2a8cab17c913a88d850c7b9c408fb.

Change-Id: I00bbc8b29b49774f31f054406c11cceee71a8aef

scanning/scanner_impl.cpp

diff --git a/scanning/scanner_impl.cpp b/scanning/scanner_impl.cpp
index ea56e74..0fa5165 100644
--- a/scanning/scanner_impl.cpp
+++ b/scanning/scanner_impl.cpp
@@ -335,9 +335,7 @@
     // TODO: Pass other parameters back once we find framework needs them.
     if (aborted) {
       LOG(WARNING) << "Scan aborted";
-      // TODO(b/36231150): Only plumb through scan aborted event when
-      // we make sure WificondScanner.java won't cause a tight loop.
-      // scan_event_handler_->OnScanFailed();
+      scan_event_handler_->OnScanFailed();
     } else {
       scan_event_handler_->OnScanResultReady();
     }