Snap for 7641971 from 51e6cf76bbca3c5794862b1ad194a60086fcee35 to mainline-permission-release
Change-Id: I9b998dafa5328da020a88d4e8479e94c0179eea9
diff --git a/host/commands/assemble_cvd/assemble_cvd.cc b/host/commands/assemble_cvd/assemble_cvd.cc
index c249473..27eadb5 100644
--- a/host/commands/assemble_cvd/assemble_cvd.cc
+++ b/host/commands/assemble_cvd/assemble_cvd.cc
@@ -51,8 +51,7 @@
FetcherConfig FindFetcherConfig(const std::vector<std::string>& files) {
FetcherConfig fetcher_config;
for (const auto& file : files) {
- auto expected_pos = file.size() - kFetcherConfigFile.size();
- if (file.rfind(kFetcherConfigFile) == expected_pos) {
+ if (android::base::EndsWith(file, kFetcherConfigFile)) {
if (fetcher_config.LoadFromFile(file)) {
return fetcher_config;
}
diff --git a/shared/device.mk b/shared/device.mk
index 9e90e8e..8647d01 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -142,6 +142,9 @@
# DRM service opt-in
PRODUCT_VENDOR_PROPERTIES += drm.service.enabled=true
+# Call deleteAllKeys if vold detects a factory reset
+PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled=true
+
PRODUCT_SOONG_NAMESPACES += hardware/google/camera
PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera
