Snap for 7901677 from 73dac838db31c6bc47591ccc48bf37230abd6cb6 to sc-platform-release
Change-Id: Iecf07291b56474d9f8de34a78e7d16ffe094c34b
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 8647d01..57dc767 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -191,8 +191,7 @@
PRODUCT_PACKAGES += \
libEGL_angle \
libGLESv1_CM_angle \
- libGLESv2_angle \
- libfeature_support_angle.so
+ libGLESv2_angle
# SwiftShader provides a software-only implementation that is not thread-safe
PRODUCT_PACKAGES += \
diff --git a/shared/sepolicy/system_ext/private/platform_app.te b/shared/sepolicy/system_ext/private/platform_app.te
index def6ca2..3a789d8 100644
--- a/shared/sepolicy/system_ext/private/platform_app.te
+++ b/shared/sepolicy/system_ext/private/platform_app.te
@@ -1 +1,4 @@
get_prop(platform_app, vendor_aware_available_prop)
+
+# allow systemui to set boot animation colors
+set_prop(platform_app, bootanim_system_prop);
diff --git a/shared/sepolicy/system_ext/private/property_contexts b/shared/sepolicy/system_ext/private/property_contexts
index 13c17c3..6d6af07 100644
--- a/shared/sepolicy/system_ext/private/property_contexts
+++ b/shared/sepolicy/system_ext/private/property_contexts
@@ -7,3 +7,9 @@
persist.vendor.radio.smlog_switch u:object_r:vendor_radio_prop:s0
ro.vendor.radio.log_loc u:object_r:vendor_radio_prop:s0
ro.vendor.radio.log_prefix u:object_r:vendor_radio_prop:s0
+
+# Boot animation dynamic colors
+persist.bootanim.color1 u:object_r:bootanim_system_prop:s0 exact int
+persist.bootanim.color2 u:object_r:bootanim_system_prop:s0 exact int
+persist.bootanim.color3 u:object_r:bootanim_system_prop:s0 exact int
+persist.bootanim.color4 u:object_r:bootanim_system_prop:s0 exact int
