commit 1182bcdc6645d0e9a488010b1f15a073c5255d0a
author Tao Bao <tbao@google.com> Tue Jun 04 20:59:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 04 20:59:04 2019 -0700
tree 5bf29c411dd3d024c28a3cbb3835a7d29f380c55
parent 334fd5f2b173e1b893415d96d2fa4212c6bbfaaa
parent 5726cbc18420c3b2722a68ebc10acb5c39d2052f

Merge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201 am: 9b2cfec8dd
am: 5726cbc184

Change-Id: I3b0a12a7d7eb19112a8049dadc2c3d563feddbaf

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) {