tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I71b34181,Ibd05137a am: 8f09cb5ba6 am: 860d84cf55 am: 99acf232cf

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2444305

Change-Id: Id6d972f34e5e0cb7194911eb5e4b1c449336a2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2023-02-22 02:40:20 +00:00 committed by Automerger Merge Worker
commit 1173feedc7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/init.cpp
View file

@ -51,6 +51,7 @@
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/thread_annotations.h>
#include <fs_avb/fs_avb.h>
#include <fs_mgr_vendor_overlay.h>
#include <keyutils.h>
@ -211,16 +212,16 @@ static class PropWaiterState {
}
private:
void ResetWaitForPropLocked() {
void ResetWaitForPropLocked() EXCLUSIVE_LOCKS_REQUIRED(lock_) {
wait_prop_name_.clear();
wait_prop_value_.clear();
waiting_for_prop_.reset();
}
std::mutex lock_;
std::unique_ptr<Timer> waiting_for_prop_{nullptr};
std::string wait_prop_name_;
std::string wait_prop_value_;
GUARDED_BY(lock_) std::unique_ptr<Timer> waiting_for_prop_{nullptr};
GUARDED_BY(lock_) std::string wait_prop_name_;
GUARDED_BY(lock_) std::string wait_prop_value_;
} prop_waiter_state;
@ -259,7 +260,7 @@ static class ShutdownState {
private:
std::mutex shutdown_command_lock_;
std::string shutdown_command_;
std::string shutdown_command_ GUARDED_BY(shutdown_command_lock_);
bool do_shutdown_ = false;
} shutdown_state;