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

Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp am: ce3fd2b509

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325559

Change-Id: Ifecb4e7c5ae7a0df26346b50dec6f38ecc9282c2
This commit is contained in:
Jooyung Han
2020-08-10 16:51:27 +00:00
committed by Automerger Merge Worker
parent 2af8e46e72 ce3fd2b509
commit 668e478fda
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,7 @@ Status Idmap2Service::verifyIdmap(const std::string& target_apk_path,
Status Idmap2Service::createIdmap(const std::string& target_apk_path, Status Idmap2Service::createIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies, const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id ATTRIBUTE_UNUSED, bool enforce_overlayable, int32_t user_id ATTRIBUTE_UNUSED,
aidl::nullable<std::string>* _aidl_return) { std::optional<std::string>* _aidl_return) {
assert(_aidl_return); assert(_aidl_return);
SYSTRACE << "Idmap2Service::createIdmap " << target_apk_path << " " << overlay_apk_path; SYSTRACE << "Idmap2Service::createIdmap " << target_apk_path << " " << overlay_apk_path;
_aidl_return->reset(); _aidl_return->reset();
@@ -214,7 +214,7 @@ Status Idmap2Service::createIdmap(const std::string& target_apk_path,
return error("failed to write to idmap path " + idmap_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(); return ok();
} }

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

@@ -19,7 +19,6 @@
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <binder/BinderService.h> #include <binder/BinderService.h>
#include <binder/Nullable.h>
#include "android/os/BnIdmap2.h" #include "android/os/BnIdmap2.h"
@@ -45,7 +44,7 @@ class Idmap2Service : public BinderService<Idmap2Service>, public BnIdmap2 {
binder::Status createIdmap(const std::string& target_apk_path, binder::Status createIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies, const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id, bool enforce_overlayable, int32_t user_id,
aidl::nullable<std::string>* _aidl_return) override; std::optional<std::string>* _aidl_return) override;
private: private:
// Cache the crc of the android framework package since the crc cannot change without a reboot. // Cache the crc of the android framework package since the crc cannot change without a reboot.

3
services/incremental/IncrementalService.cpp
View File

@@ -23,7 +23,6 @@
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <binder/AppOpsManager.h> #include <binder/AppOpsManager.h>
#include <binder/Nullable.h>
#include <binder/Status.h> #include <binder/Status.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
@@ -1404,7 +1403,7 @@ void IncrementalService::prepareDataLoaderLocked(IncFsMount& ifs, DataLoaderPara
} }
FileSystemControlParcel fsControlParcel; FileSystemControlParcel fsControlParcel;
fsControlParcel.incremental = aidl::make_nullable<IncrementalFileSystemControlParcel>(); fsControlParcel.incremental = std::make_optional<IncrementalFileSystemControlParcel>();
fsControlParcel.incremental->cmd.reset(dup(ifs.control.cmd())); fsControlParcel.incremental->cmd.reset(dup(ifs.control.cmd()));
fsControlParcel.incremental->pendingReads.reset(dup(ifs.control.pendingReads())); fsControlParcel.incremental->pendingReads.reset(dup(ifs.control.pendingReads()));
fsControlParcel.incremental->log.reset(dup(ifs.control.logs())); fsControlParcel.incremental->log.reset(dup(ifs.control.logs()));