diff options
| author | Jooyung Han <jooyung@google.com> | 2020-01-23 13:28:36 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2020-02-24 09:31:47 +0900 |
| commit | 57110a4752f7f48220eb51978ce9e5c8f31f1d9b (patch) | |
| tree | a3b071b75cbd2c6b1f0f9148fdfc78cc07cdb725 /gatekeeperd | |
| parent | b9c95f8e6a8875b866f61afd97836e2482da3fca (diff) | |
| download | core-57110a4752f7f48220eb51978ce9e5c8f31f1d9b.tar.gz | |
Use optional for nullable types
AIDL generates optional<T> for nullable T types for C++, which is more
efficient and idomatic and easy to use.
Bug: 144773267
Test: build/flash/boot
Merged-In: I6bf4c2017f113f4d326fddb1d76163c2fed34d50
Change-Id: I6bf4c2017f113f4d326fddb1d76163c2fed34d50
(cherry picked from commit 5f7f450fa38e752ae49ae91b1bdaf267ec9deea5)
Diffstat (limited to 'gatekeeperd')
| -rw-r--r-- | gatekeeperd/gatekeeperd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp index 1d65b1ced..c81a80ef3 100644 --- a/gatekeeperd/gatekeeperd.cpp +++ b/gatekeeperd/gatekeeperd.cpp @@ -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(); |