summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-06-05 05:59:04 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-06-05 05:59:04 +0200
commit1182bcdc6645d0e9a488010b1f15a073c5255d0a (patch)
tree5bf29c411dd3d024c28a3cbb3835a7d29f380c55
parentMerge "Use icu4j instead of its deprecated legacy alias icu4j-host" am: 14bc5e1feb am: af4d1dda03 am: 2f8626c3f7 (diff)
parentMerge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201 (diff)
downloadandroid_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.tar
android_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.tar.gz
android_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.tar.bz2
android_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.tar.lz
android_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.tar.xz
android_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.tar.zst
android_bootable_recovery-1182bcdc6645d0e9a488010b1f15a073c5255d0a.zip
-rw-r--r--minadbd/minadbd_services.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 8f2b71aa1..5eda73e40 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -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 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) {