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

Commit e149e6a7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes Ie4313c7a,I0f40b1f2 am: dc4585cb 

Change-Id: I2679a03e8f3364c7f0bc517026db9145575a9e47
parents a9dc5bd7 dc4585cb

fs_mgr/libdm/dm_target.cpp

+1 −3
Original line number Diff line number Diff line
@@ -243,12 +243,10 @@ std::string DmTargetCrypt::GetParameterString() const { 
    return android::base::Join(argv, " ");

}



const std::string DmTargetDefaultKey::name_ = "default-key";



bool DmTargetDefaultKey::IsLegacy(bool* result) {

    DeviceMapper& dm = DeviceMapper::Instance();

    DmTargetTypeInfo info;

    if (!dm.GetTargetByName(name_, &info)) return false;

    if (!dm.GetTargetByName(kName, &info)) return false;

    // dm-default-key was modified to be like dm-crypt with version 2

    *result = !info.IsAtLeast(2, 0, 0);

    return true;

fs_mgr/libdm/include/libdm/dm_target.h

+3 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ class DmTargetDefaultKey final : public DmTarget { 
          blockdev_(blockdev),

          start_sector_(start_sector) {}



    std::string name() const override { return name_; }

    std::string name() const override { return kName; }

    bool Valid() const override;

    std::string GetParameterString() const override;

    static bool IsLegacy(bool* result);
@@ -296,7 +296,8 @@ class DmTargetDefaultKey final : public DmTarget { 
    void SetWrappedKeyV0() { is_hw_wrapped_ = true; }



  private:

    static const std::string name_;

    inline static const std::string kName = "default-key";



    std::string cipher_;

    std::string key_;

    std::string blockdev_;

fs_mgr/libsnapshot/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ cc_binary { 
        "snapshotctl.cpp",

    ],

    static_libs: [

        "libdm",

        "libfstab",

        "libsnapshot",

    ],