commit 9ee4b6996d25bc75293608bac1603826887e501c
author Songchun Fan <schfan@google.com> Thu Aug 08 18:05:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 08 18:05:21 2019 -0700
tree 19a236459c2f60a7e6adecc8949199471965a61c
parent 6402cfd74c42c1face768af31d793460a40ff886
parent 4a94a9ca5b060c4651ec635843570543fea946d7

Merge "[adb] Cache features set inside the client process"
am: 6e861740ff

Change-Id: I150ca16badd7eb07e2706d3832504adebad68005

adb/client/adb_client.cpp

diff --git a/adb/client/adb_client.cpp b/adb/client/adb_client.cpp
index 0f621eb..d91ae35 100644
--- a/adb/client/adb_client.cpp
+++ b/adb/client/adb_client.cpp
@@ -400,9 +400,15 @@
 }
 
 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();