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

am: 6c37304201

Change-Id: I8295063fd81b0cdc7625410c1482c9bab538ebbc
This commit is contained in:
Tao Bao
2019-06-04 19:30:29 -07:00
committed by android-build-merger

View File

@@ -158,8 +158,15 @@ static void RescueInstallHostService(unique_fd sfd, const std::string& args) {
static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) { static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) {
static const std::unordered_set<std::string> kGetpropAllowedProps = { static const std::unordered_set<std::string> kGetpropAllowedProps = {
"ro.build.fingerprint",
"ro.build.date.utc", "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(); auto allowed = kGetpropAllowedProps.find(prop) != kGetpropAllowedProps.end();
if (!allowed) { if (!allowed) {