Merge "[adb] Cache features set inside the client process" (25fc8635) · Commits · e / os / android_system_core

adb/client/adb_client.cpp

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -400,9 +400,15 @@ std::string format_host_command(const char* command) {
	}		}

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