ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr: use __ANDROID_API_Q__ instead of pre_gki_level" am: 9b6922b5df

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

Change-Id: If9f3833dfec2f29d436fd535d64404281a93d82e
This commit is contained in:
Eric Biggers 2020-08-10 22:53:51 +00:00 • committed by Automerger Merge Worker
commit f79287b5cc
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/fs_mgr.cpp
View file

@ -1113,10 +1113,9 @@ class CheckpointManager {
// metadata-encrypted device with smaller blocks, we must not change this for // 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 // devices shipped with Q or earlier unless they explicitly selected dm-default-key
// v2 // v2
constexpr unsigned int pre_gki_level = __ANDROID_API_Q__;
unsigned int options_format_version = android::base::GetUintProperty<unsigned int>( unsigned int options_format_version = android::base::GetUintProperty<unsigned int>(
"ro.crypto.dm_default_key.options_format.version", "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) { if (options_format_version > 1) {
bowTarget->SetBlockSize(4096); bowTarget->SetBlockSize(4096);
} }