From 178040341b58d0b5966740f672f4a2468e8fa3f1 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Fri, 10 Apr 2020 14:01:58 +0200 Subject: [PATCH 1/2] Move ro.emulated_storage properties to PRODUCT_PROPERTY_OVERRIDES. These need to be a part of the vendor partition and be set even when using GSI. Bug: 152170470 Bug: 153525566 Test: android.drm.cts.DRMTest#testForwardLockAccess Change-Id: I1e69d5c203d4f7480a6651ca780fbd307ce71c23 --- target/product/emulated_storage.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/product/emulated_storage.mk b/target/product/emulated_storage.mk index 89de192da..0b9dc0fce 100644 --- a/target/product/emulated_storage.mk +++ b/target/product/emulated_storage.mk @@ -15,7 +15,7 @@ # PRODUCT_QUOTA_PROJID := 1 -PRODUCT_PRODUCT_PROPERTIES += ro.emulated_storage.projid=1 +PRODUCT_PROPERTY_OVERRIDES += ro.emulated_storage.projid=1 PRODUCT_FS_CASEFOLD := 1 -PRODUCT_PRODUCT_PROPERTIES += ro.emulated_storage.casefold=1 +PRODUCT_PROPERTY_OVERRIDES += ro.emulated_storage.casefold=1 From c5ce32b19a548d35c1fa83252fa7eb41f893869d Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Wed, 15 Apr 2020 11:38:08 +0200 Subject: [PATCH 2/2] Rename ro.emulated_storage properties. Whether these are enabled or not is independent of whether storage is emulated or not; instead, use 'external_storage', and add the enabled suffix as per property naming guidelines. Bug: 152170470 Bug: 153525566 Test: N/A Change-Id: Id893ce19025ded1ee1521081f7fc722dfee8e662 --- target/product/emulated_storage.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/product/emulated_storage.mk b/target/product/emulated_storage.mk index 0b9dc0fce..d7cc9cead 100644 --- a/target/product/emulated_storage.mk +++ b/target/product/emulated_storage.mk @@ -15,7 +15,7 @@ # PRODUCT_QUOTA_PROJID := 1 -PRODUCT_PROPERTY_OVERRIDES += ro.emulated_storage.projid=1 +PRODUCT_PROPERTY_OVERRIDES += external_storage.projid.enabled=1 PRODUCT_FS_CASEFOLD := 1 -PRODUCT_PROPERTY_OVERRIDES += ro.emulated_storage.casefold=1 +PRODUCT_PROPERTY_OVERRIDES += external_storage.casefold.enabled=1