commit 6548ac62d3599aff521e7613da6e305619b126ff
author Yurii Zubrytskyi <zyy@google.com> Thu Jun 27 13:47:17 2019 -0700
committer Songchun Fan <schfan@google.com> Fri Aug 02 11:37:32 2019 -0700
tree c113061dade5c4b4e88f109143305b2d58e88b80
parent 434c2af07f80f9e4fdac4edbe4996ede09107e4d

[adb] Cache features set inside the client process

Test: manual
Change-Id: I99962edd85e9694c3ca309624368cda6355da008

adb/client/adb_client.cpp

diff --git a/adb/client/adb_client.cpp b/adb/client/adb_client.cpp
index 7e408a8..89dcb27 100644
--- a/adb/client/adb_client.cpp
+++ b/adb/client/adb_client.cpp
@@ -398,9 +398,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();