Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75ebdd9c authored by Eric Biggers's avatar Eric Biggers
Browse files

fs_mgr: use __ANDROID_API_Q__ instead of pre_gki_level 

The name "pre_gki_level" is causing some confusion because not all
devices launching with Android R are subject to the GKI requirement.
(See b/161563110#comment11.)  E.g., devices that use a 4.14-based kernel
are exempt from GKI.  However, the encryption requirements still apply.

Just use __ANDROID_API_Q__ directly instead.

No change in behavior.

Change-Id: I4242745ccc9f88e084a1adfab5796daa9bc59b6e
parent 2cfea97b

fs_mgr/fs_mgr.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1113,10 +1113,9 @@ class CheckpointManager { 
                // metadata-encrypted device with smaller blocks, we must not change this for

                // devices shipped with Q or earlier unless they explicitly selected dm-default-key

                // v2

                constexpr unsigned int pre_gki_level = __ANDROID_API_Q__;

                unsigned int options_format_version = android::base::GetUintProperty<unsigned int>(

                        "ro.crypto.dm_default_key.options_format.version",

                        (android::fscrypt::GetFirstApiLevel() <= pre_gki_level ? 1 : 2));

                        (android::fscrypt::GetFirstApiLevel() <= __ANDROID_API_Q__ ? 1 : 2));

                if (options_format_version > 1) {

                    bowTarget->SetBlockSize(4096);

                }