From 71c56f6dd5c4bf134342db08fe03cdc61714c5bd Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Fri, 28 Apr 2017 01:11:35 +0000 Subject: [PATCH] Revert "Revert "Stop dropping caches now we have kernel fix"" This reverts commit 8ad0bef7b5b1b6e1ba3afe441d2dcc9a06e782a7. Bug: 37231161 Test: Boot device with FBE enabled. ls /storage/emulated/0/Android Unlock device. ls /storage/emulated/0/Android 1st will not be found. Second should be found. Change-Id: I92c7ad0adaa7bd357e10661a47cc667ac0ff84b4 --- KeyUtil.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/KeyUtil.cpp b/KeyUtil.cpp index 4d507a1..fe0f3cb 100644 --- a/KeyUtil.cpp +++ b/KeyUtil.cpp @@ -111,13 +111,6 @@ bool installKey(const std::string& key, std::string* raw_ref) { LOG(DEBUG) << "Added key " << key_id << " (" << ref << ") to keyring " << device_keyring << " in process " << getpid(); - // *TODO* Remove this code when kernel is fixed - see b/28373400 - // Kernel preserves caches across a key insertion with ext4ice, which leads - // to contradictory dirents - if (!android::base::WriteStringToFile("3", "/proc/sys/vm/drop_caches")) { - PLOG(ERROR) << "Failed to drop_caches"; - } - return true; }