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

Commit b879492c authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: use __ANDROID_API_Q__ instead of pre_gki_level" am: 9b6922b5... 

Merge "fs_mgr: use __ANDROID_API_Q__ instead of pre_gki_level" am: 9b6922b5 am: f79287b5 am: 968d940d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1394890

Change-Id: I454738b551d94e769e9e928ce7adfbb63157d3ca
parents cdde62ce 968d940d

fs_mgr/fs_mgr.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1133,10 +1133,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);

                }