diff options
| author | 2020-08-10 16:31:18 +0000 | |
|---|---|---|
| committer | 2020-08-10 16:31:18 +0000 | |
| commit | ce3fd2b5095195e605e3754e00c797d809779fdb (patch) | |
| tree | 885973c54bfafe0ed2fed6fc18b63953725c98f3 /services/incremental/IncrementalService.cpp | |
| parent | 67a96b1a038db37dab744ac03d6d2d0e0c4dc9fd (diff) | |
| parent | 16bac8513e2f5be0fc8e7d7fe261b1756a0231d1 (diff) | |
Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp
Diffstat (limited to 'services/incremental/IncrementalService.cpp')
| -rw-r--r-- | services/incremental/IncrementalService.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index a5f0d045948c..f7082a9a1a0c 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -23,7 +23,6 @@ #include <android-base/properties.h> #include <android-base/stringprintf.h> #include <binder/AppOpsManager.h> -#include <binder/Nullable.h> #include <binder/Status.h> #include <sys/stat.h> #include <uuid/uuid.h> @@ -1404,7 +1403,7 @@ void IncrementalService::prepareDataLoaderLocked(IncFsMount& ifs, DataLoaderPara } FileSystemControlParcel fsControlParcel; - fsControlParcel.incremental = aidl::make_nullable<IncrementalFileSystemControlParcel>(); + fsControlParcel.incremental = std::make_optional<IncrementalFileSystemControlParcel>(); fsControlParcel.incremental->cmd.reset(dup(ifs.control.cmd())); fsControlParcel.incremental->pendingReads.reset(dup(ifs.control.pendingReads())); fsControlParcel.incremental->log.reset(dup(ifs.control.logs())); |