commit 259ef1ca7e3cd434c28cd054f13ae0137bc54da8
author Jooyung Han <jooyung@google.com> Fri Mar 13 01:37:26 2020 +0000
committer Jooyung Han <jooyung@google.com> Fri Mar 13 08:25:43 2020 +0000
tree 1a0cb0e34f9e17d95b118c247f18da8fa4c23ff5
parent b1d388c75118bb5de5bd1727263bf9e752fa936e

Revert "Merge "Revert "Use aidl::nullable for nullable type in C++"" into rvc-dev-plus-aosp am: 9beacac0c9 am: bd9b7af30e am: ec09e10ca3"

This reverts commit b1d388c75118bb5de5bd1727263bf9e752fa936e.

Reason for revert: Unintended revert got merged.

Change-Id: I85637ae4e88a9dcd233b3c17c6030fb726d5681f

Exempt-From-Owner-Approval: reverting unintended revert

services/incremental/IncrementalService.cpp

diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index a903f4c..cccd0133 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -28,6 +28,7 @@
 #include <androidfw/ZipFileRO.h>
 #include <androidfw/ZipUtils.h>
 #include <binder/BinderService.h>
+#include <binder/Nullable.h>
 #include <binder/ParcelFileDescriptor.h>
 #include <binder/Status.h>
 #include <sys/stat.h>
@@ -1083,7 +1084,7 @@
         return false;
     }
     FileSystemControlParcel fsControlParcel;
-    fsControlParcel.incremental = IncrementalFileSystemControlParcel();
+    fsControlParcel.incremental = aidl::make_nullable<IncrementalFileSystemControlParcel>();
     fsControlParcel.incremental->cmd.reset(base::unique_fd(::dup(ifs.control.cmd)));
     fsControlParcel.incremental->pendingReads.reset(
             base::unique_fd(::dup(ifs.control.pendingReads)));