Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I008d05b12fe2239eb6332c1953f302383fe5edc2
This commit is contained in:
Automerger Merge Worker
2020-03-12 07:24:32 +00:00
parent 94179e3762 9beacac0c9
commit bd9b7af30e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/idmap2/idmap2d/Idmap2Service.cpp
View File

@@ -113,7 +113,7 @@ Status Idmap2Service::verifyIdmap(const std::string& overlay_apk_path,
Status Idmap2Service::createIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id ATTRIBUTE_UNUSED,
aidl::nullable<std::string>* _aidl_return) {
std::optional<std::string>* _aidl_return) {
assert(_aidl_return);
SYSTRACE << "Idmap2Service::createIdmap " << target_apk_path << " " << overlay_apk_path;
_aidl_return->reset();
@@ -155,7 +155,7 @@ Status Idmap2Service::createIdmap(const std::string& target_apk_path,
return error("failed to write to idmap path " + idmap_path);
}
*_aidl_return = aidl::make_nullable<std::string>(idmap_path);
*_aidl_return = idmap_path;
return ok();
}

6
cmds/idmap2/idmap2d/Idmap2Service.h
View File

@@ -19,7 +19,9 @@
#include <android-base/unique_fd.h>
#include <binder/BinderService.h>
#include <binder/Nullable.h>
#include <optional>
#include <string>
#include "android/os/BnIdmap2.h"
@@ -44,7 +46,7 @@ class Idmap2Service : public BinderService<Idmap2Service>, public BnIdmap2 {
binder::Status createIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id,
aidl::nullable<std::string>* _aidl_return) override;
std::optional<std::string>* _aidl_return) override;
};
} // namespace android::os

3
services/incremental/IncrementalService.cpp
View File

@@ -28,7 +28,6 @@
#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>
@@ -1084,7 +1083,7 @@ bool IncrementalService::prepareDataLoader(IncrementalService::IncFsMount& ifs,
return false;
}
FileSystemControlParcel fsControlParcel;
fsControlParcel.incremental = aidl::make_nullable<IncrementalFileSystemControlParcel>();
fsControlParcel.incremental = IncrementalFileSystemControlParcel();
fsControlParcel.incremental->cmd.reset(base::unique_fd(::dup(ifs.control.cmd)));
fsControlParcel.incremental->pendingReads.reset(
base::unique_fd(::dup(ifs.control.pendingReads)));