Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339

Change-Id: I23b9a01632b61a92896ae83e2152fa047dd85c48

diff --cc Android.bp
Simple merge

diff --cc VoldNativeService.cpp
index 241c2a0,e345d2f..d310acd
--- 1/VoldNativeService.cpp
--- 2/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@@ -18,19 -18,7 +18,18 @@@
  
  #include "VoldNativeService.h"
  
 +#include <android-base/logging.h>
 +#include <android-base/stringprintf.h>
 +#include <android-base/strings.h>
 +#include <fs_mgr.h>
 +#include <fscrypt/fscrypt.h>
 +#include <private/android_filesystem_config.h>
 +#include <utils/Trace.h>
 +
 +#include <fstream>
 +#include <thread>
 +
  #include "Benchmark.h"
- #include "CheckEncryption.h"
  #include "Checkpoint.h"
  #include "FsCrypt.h"
  #include "IdleMaint.h"
@@@ -351,20 -339,9 +350,9 @@@ binder::Status VoldNativeService::bench
      return Ok();
  }
  
- binder::Status VoldNativeService::checkEncryption(const std::string& volId) {
-     ENFORCE_SYSTEM_OR_ROOT;
-     CHECK_ARGUMENT_ID(volId);
-     ACQUIRE_LOCK;
- 
-     std::string path;
-     auto status = pathForVolId(volId, &path);
-     if (!status.isOk()) return status;
-     return translate(android::vold::CheckEncryption(path));
- }
- 
  binder::Status VoldNativeService::moveStorage(
 -    const std::string& fromVolId, const std::string& toVolId,
 -    const android::sp<android::os::IVoldTaskListener>& listener) {
 +        const std::string& fromVolId, const std::string& toVolId,
 +        const android::sp<android::os::IVoldTaskListener>& listener) {
      ENFORCE_SYSTEM_OR_ROOT;
      CHECK_ARGUMENT_ID(fromVolId);
      CHECK_ARGUMENT_ID(toVolId);

diff --cc VoldNativeService.h
Simple merge

diff --cc binder/android/os/IVold.aidl
Simple merge

diff --cc vdc.cpp
Simple merge