commit 6c37304201b1605baea54a3462979f3693241aed
author Tao Bao <tbao@google.com> Tue Jun 04 17:53:25 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 04 17:53:25 2019 -0700
tree fe3054b8464e37333955e3620d73764c41d5afc6
parent af4d1dda03f50bfce2ec03f8e5a6a6c1dad12ab6
parent 1ef7f92871e30301d9b74e4c79203f730a86c1be

Merge "minadbd: More allowed properties."
am: 1ef7f92871

Change-Id: I2e663ae4d334f40bf688b70630ad823c1eb92444

minadbd/minadbd_services.cpp

diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 8f2b71a..5eda73e 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -158,8 +158,15 @@
 
 static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) {
   static const std::unordered_set<std::string> kGetpropAllowedProps = {
-    "ro.build.fingerprint",
     "ro.build.date.utc",
+    "ro.build.fingerprint",
+    "ro.build.flavor",
+    "ro.build.id",
+    "ro.build.product",
+    "ro.build.tags",
+    "ro.build.version.incremental",
+    "ro.product.device",
+    "ro.product.vendor.device",
   };
   auto allowed = kGetpropAllowedProps.find(prop) != kGetpropAllowedProps.end();
   if (!allowed) {