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

Commit 1f3a8c4f authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

Merge "Fix ext4/metadata/udc issue" 

am: 8c8ce02e

Change-Id: Ic1dd99dfdf886e36f0e1de2638202ca406354267
parents 88dc4500 8c8ce02e

fs_mgr/libdm/dm_target.cpp

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ std::string DmTargetCrypt::GetParameterString() const { 
}



std::string DmTargetDefaultKey::GetParameterString() const {

    return cipher_ + " " + key_ + " " + blockdev_ + " " + std::to_string(start_sector_);

    return cipher_ + " " + key_ + " " + blockdev_ + " " + std::to_string(start_sector_) +

           (set_dun_ ? " 1 set_dun" : "");

}



}  // namespace dm

fs_mgr/libdm/include/libdm/dm_target.h

+5 −2
Original line number Diff line number Diff line
@@ -280,12 +280,14 @@ class DmTargetCrypt final : public DmTarget { 
class DmTargetDefaultKey final : public DmTarget {

  public:

    DmTargetDefaultKey(uint64_t start, uint64_t length, const std::string& cipher,

                       const std::string& key, const std::string& blockdev, uint64_t start_sector)

                       const std::string& key, const std::string& blockdev, uint64_t start_sector,

                       bool set_dun = false)

        : DmTarget(start, length),

          cipher_(cipher),

          key_(key),

          blockdev_(blockdev),

          start_sector_(start_sector) {}

          start_sector_(start_sector),

          set_dun_(set_dun) {}



    std::string name() const override { return "default-key"; }

    bool Valid() const override { return true; }
@@ -296,6 +298,7 @@ class DmTargetDefaultKey final : public DmTarget { 
    std::string key_;

    std::string blockdev_;

    uint64_t start_sector_;

    bool set_dun_;

};



}  // namespace dm