Merge "Change abortScan() binder API to void" into oc-dev am: 7124c9f3f0

am: d96924d24c

Change-Id: I1fc5276a6e3a6907f8492785981cd3e333a92135

diff --cc scanning/scanner_impl.cpp
index 05ebedf,2c1b1d0..9033dc1
--- 1/scanning/scanner_impl.cpp
--- 2/scanning/scanner_impl.cpp
+++ b/scanning/scanner_impl.cpp
@@@ -341,11 -278,11 +341,10 @@@ bool ScannerImpl::StopPnoScanDefault() 
    }
    LOG(INFO) << "Pno scan stopped";
    pno_scan_started_ = false;
 -  *out_success = true;
 -  return Status::ok();
 +  return true;
  }
  
- Status ScannerImpl::abortScan(bool* out_success) {
-   *out_success = false;
+ Status ScannerImpl::abortScan() {
    if (!CheckIsValid()) {
      return Status::ok();
    }

diff --cc scanning/scanner_impl.h
Simple merge