commit a6957c0f7aa728ee57a01d7c58981c1b11515918
author Eric Biggers <ebiggers@google.com> Wed Jun 15 18:52:18 2022 +0000
committer Eric Biggers <ebiggers@google.com> Wed Jun 15 18:52:18 2022 +0000
tree 8e6f0949007343a2aa0fdfe1a5dbdb2dda4e980f
parent 7b04dba53ea0cfc91927e647edf840d94f57cbae

Rename fscrypt_is_native() to IsFbeEnabled()

Now that emulated FBE is no longer supported, there is no longer any
distinction between native FBE and emulated FBE.  There is just FBE.

Referring to FBE as "fscrypt" is also poor practice, as fscrypt (the
Linux kernel support for filesystem-level encryption) is just one part
of FBE, the Android feature.

Therefore, rename fscrypt_is_native() to IsFbeEnabled().

Bug: 232458753
Change-Id: Idf4cb25d37bc3e81836fcc5a1d96f79ccfa443b7

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index a7d39c1..5cef239 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -358,7 +358,7 @@
         LOG(ERROR) << "Failed to unlink " << keyPath;
         success = false;
     }
-    if (fscrypt_is_native()) {
+    if (IsFbeEnabled()) {
         if (!fscrypt_destroy_volume_keys(fsUuid)) {
             success = false;
         }