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

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

Merge "Use optional for nullable types" am: 0e49bfa8 

Change-Id: I0a4adc474ad910bb24a7ebbed6a4c6e3f9862128
parents d5fd1b7e 0e49bfa8

gatekeeperd/gatekeeperd.cpp

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ public: 


#define GK_ERROR *gkResponse = GKResponse::error(), Status::ok()



    Status enroll(int32_t uid, const std::unique_ptr<std::vector<uint8_t>>& currentPasswordHandle,

                  const std::unique_ptr<std::vector<uint8_t>>& currentPassword,

    Status enroll(int32_t uid, const std::optional<std::vector<uint8_t>>& currentPasswordHandle,

                  const std::optional<std::vector<uint8_t>>& currentPassword,

                  const std::vector<uint8_t>& desiredPassword, GKResponse* gkResponse) override {

        IPCThreadState* ipc = IPCThreadState::self();

        const int calling_pid = ipc->getCallingPid();