Snap for 4502278 from f2948ed7a88a8664b3b0704dc2d0bdc5fb096921 to pi-release
Change-Id: I00346ab28f198e7a8473ce5fdecbbea67dc4c56d
diff --git a/image_properties_android_unittest.cc b/image_properties_android_unittest.cc
index 9bbb8b0..7327554 100644
--- a/image_properties_android_unittest.cc
+++ b/image_properties_android_unittest.cc
@@ -36,9 +36,9 @@
void SetUp() override {
// Create a uniquely named test directory.
ASSERT_TRUE(tempdir_.CreateUniqueTempDir());
- osrelease_dir_ = tempdir_.path().Append("etc/os-release.d");
+ osrelease_dir_ = tempdir_.GetPath().Append("etc/os-release.d");
EXPECT_TRUE(base::CreateDirectory(osrelease_dir_));
- test::SetImagePropertiesRootPrefix(tempdir_.path().value().c_str());
+ test::SetImagePropertiesRootPrefix(tempdir_.GetPath().value().c_str());
}
void WriteOsRelease(const string& key, const string& value) {
diff --git a/update_engine.rc b/update_engine.rc
index 0576045..a7d6235 100644
--- a/update_engine.rc
+++ b/update_engine.rc
@@ -3,3 +3,7 @@
user root
group root system wakelock inet cache
writepid /dev/cpuset/system-background/tasks
+ disabled
+
+on property:ro.boot.slot_suffix=*
+ enable update_engine