From eb850f93ab056c05cd949ada794c4dab42027a3c Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Thu, 1 Mar 2018 16:48:27 +0000
Subject: [PATCH] Remove secdiscard IPC call

No longer used by the framework, hence removing.

Bug: 62140539
Test: builds
Change-Id: I17b9818ea6121d84223a502949186cf679a83a90
---
 Ext4Crypt.cpp                | 4 ----
 Ext4Crypt.h                  | 2 --
 VoldNativeService.cpp        | 8 --------
 VoldNativeService.h          | 2 --
 binder/android/os/IVold.aidl | 2 --
 5 files changed, 18 deletions(-)

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 1b71365..67b7e90 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -835,7 +835,3 @@ bool e4crypt_destroy_volume_keys(const std::string& volume_uuid) {
     res &= destroy_volume_keys("/data/misc_de", volume_uuid);
     return res;
 }
-
-bool e4crypt_secdiscard(const std::string& path) {
-    return android::vold::runSecdiscardSingle(path);
-}
diff --git a/Ext4Crypt.h b/Ext4Crypt.h
index 4226f15..a43a68a 100644
--- a/Ext4Crypt.h
+++ b/Ext4Crypt.h
@@ -36,5 +36,3 @@ bool e4crypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
 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);
diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index f4961ce..81523c6 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -759,13 +759,5 @@ binder::Status VoldNativeService::destroyUserStorage(const std::unique_ptr<std::
     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
diff --git a/VoldNativeService.h b/VoldNativeService.h
index 817f815..2e90101 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -113,8 +113,6 @@ public:
             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
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 @@ interface IVold {
     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;