tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove secdiscard IPC call

Browse source 
No longer used by the framework, hence removing.

Bug: 62140539
Test: builds
Change-Id: I17b9818ea6121d84223a502949186cf679a83a90
This commit is contained in:
Rubin Xu 2018-03-01 16:48:27 +00:00
parent de787a847a
commit eb850f93ab
5 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ext4Crypt.cpp
View file

@ -835,7 +835,3 @@ bool e4crypt_destroy_volume_keys(const std::string& volume_uuid) {
res &= destroy_volume_keys("/data/misc_de", volume_uuid); res &= destroy_volume_keys("/data/misc_de", volume_uuid);
return res; return res;
} }
bool e4crypt_secdiscard(const std::string& path) {
return android::vold::runSecdiscardSingle(path);
}

2
Ext4Crypt.h
View file

@ -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_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_destroy_volume_keys(const std::string& volume_uuid);
bool e4crypt_secdiscard(const std::string& path);

8
VoldNativeService.cpp
View file

@ -759,13 +759,5 @@ binder::Status VoldNativeService::destroyUserStorage(const std::unique_ptr<std::
return translateBool(e4crypt_destroy_user_storage(uuid_, userId, flags)); 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 vold
} // namespace android } // namespace android

2
VoldNativeService.h
View file

@ -113,8 +113,6 @@ public:
int32_t userId, int32_t userSerial, int32_t flags); int32_t userId, int32_t userSerial, int32_t flags);
binder::Status destroyUserStorage(const std::unique_ptr<std::string>& uuid, binder::Status destroyUserStorage(const std::unique_ptr<std::string>& uuid,
int32_t userId, int32_t flags); int32_t userId, int32_t flags);
binder::Status secdiscard(const std::string& path);
}; };
} // namespace vold } // namespace vold

2
binder/android/os/IVold.aidl
View file

@ -93,8 +93,6 @@ interface IVold {
void prepareUserStorage(@nullable @utf8InCpp String uuid, int userId, int userSerial, int storageFlags); void prepareUserStorage(@nullable @utf8InCpp String uuid, int userId, int userSerial, int storageFlags);
void destroyUserStorage(@nullable @utf8InCpp String uuid, int userId, 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_FLAG_NO_UI = 4;
const int ENCRYPTION_STATE_NONE = 1; const int ENCRYPTION_STATE_NONE = 1;