commit ea0514ee95f8f896dbfc2b398a937b9c03bb107e
author Rubin Xu <rubinxu@google.com> Tue Mar 06 23:07:19 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 06 23:07:19 2018 +0000
tree 7f17026e051b41de1edfc03e00bf4895d9776a42
parent de787a847a45cb202ed1f9cfc666c336af6569a1
parent eb850f93ab056c05cd949ada794c4dab42027a3c

Remove secdiscard IPC call
am: eb850f93ab

Change-Id: If4f758f34519cd7bf328a431dc9b14af5e475eed

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 1b71365..67b7e90 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -835,7 +835,3 @@
     res &= destroy_volume_keys("/data/misc_de", volume_uuid);
     return res;
 }
-
-bool e4crypt_secdiscard(const std::string& path) {
-    return android::vold::runSecdiscardSingle(path);
-}

Ext4Crypt.h

diff --git a/Ext4Crypt.h b/Ext4Crypt.h
index 4226f15..a43a68a 100644
--- a/Ext4Crypt.h
+++ b/Ext4Crypt.h
@@ -36,5 +36,3 @@
 bool e4crypt_destroy_user_storage(const std::string& volume_uuid, userid_t user_id, int flags);
 
 bool e4crypt_destroy_volume_keys(const std::string& volume_uuid);
-
-bool e4crypt_secdiscard(const std::string& path);

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index f4961ce..81523c6 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -759,13 +759,5 @@
     return translateBool(e4crypt_destroy_user_storage(uuid_, userId, flags));
 }
 
-binder::Status VoldNativeService::secdiscard(const std::string& path) {
-    ENFORCE_UID(AID_SYSTEM);
-    CHECK_ARGUMENT_PATH(path);
-    ACQUIRE_CRYPT_LOCK;
-
-    return translateBool(e4crypt_secdiscard(path));
-}
-
 }  // namespace vold
 }  // namespace android

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index 817f815..2e90101 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -113,8 +113,6 @@
             int32_t userId, int32_t userSerial, int32_t flags);
     binder::Status destroyUserStorage(const std::unique_ptr<std::string>& uuid,
             int32_t userId, int32_t flags);
-
-    binder::Status secdiscard(const std::string& path);
 };
 
 }  // namespace vold

binder/android/os/IVold.aidl

diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl
index a664dfa..8300a8e 100644
--- a/binder/android/os/IVold.aidl
+++ b/binder/android/os/IVold.aidl
@@ -93,8 +93,6 @@
     void prepareUserStorage(@nullable @utf8InCpp String uuid, int userId, int userSerial, int storageFlags);
     void destroyUserStorage(@nullable @utf8InCpp String uuid, int userId, int storageFlags);
 
-    void secdiscard(@utf8InCpp String path);
-
     const int ENCRYPTION_FLAG_NO_UI = 4;
 
     const int ENCRYPTION_STATE_NONE = 1;