ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: don't cache failure to get features."

Browse source
This commit is contained in:
Treehugger Robot 2020-05-18 21:12:28 +00:00 • committed by Gerrit Code Review
commit 7cd7b68f5d
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
adb/client/adb_client.cpp
View file

@ -417,17 +417,19 @@ std::string format_host_command(const char* command) {
}
const std::optional<FeatureSet>& adb_get_feature_set(std::string* error) {
static std::string cached_error [[clang::no_destroy]];
static const std::optional<FeatureSet> features
[[clang::no_destroy]] ([]() -> std::optional<FeatureSet> {
std::string result;
if (adb_query(format_host_command("features"), &result, &cached_error)) {
return StringToFeatureSet(result);
}
return std::nullopt;
}());
if (!features && error) {
*error = cached_error;
static std::mutex feature_mutex [[clang::no_destroy]];
static std::optional<FeatureSet> features [[clang::no_destroy]] GUARDED_BY(feature_mutex);
std::lock_guard<std::mutex> lock(feature_mutex);
if (!features) {
std::string result;
std::string err;
if (adb_query(format_host_command("features"), &result, &err)) {
features = StringToFeatureSet(result);
} else {
if (error) {
*error = err;
}
}
}
return features;
}