Merge "[adb] Cache features set inside the client process"

am: 6e861740ff

Change-Id: I150ca16badd7eb07e2706d3832504adebad68005
This commit is contained in:
Songchun Fan 2019-08-08 18:05:21 -07:00 committed by android-build-merger
commit 25fc86357a
1 changed files with 9 additions and 3 deletions

View File

@ -400,9 +400,15 @@ std::string format_host_command(const char* command) {
}
bool adb_get_feature_set(FeatureSet* feature_set, std::string* error) {
std::string result;
if (adb_query(format_host_command("features"), &result, error)) {
*feature_set = StringToFeatureSet(result);
static FeatureSet* features = nullptr;
if (!features) {
std::string result;
if (adb_query(format_host_command("features"), &result, error)) {
features = new FeatureSet(StringToFeatureSet(result));
}
}
if (features) {
*feature_set = *features;
return true;
}
feature_set->clear();