summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHung-ying Tyan2017-06-02 05:59:46 -0500
committerHung-ying Tyan2017-06-16 09:46:15 -0500
commit527d80d945e7b53e53bcc4d42900b3bce228f5d1 (patch)
treeb480816e87e9140e51264854fcde4d7963c3c220 /libcutils
parentfe11ca54212f83c83af3a448248deb072d8041a8 (diff)
downloadplatform-system-core-527d80d945e7b53e53bcc4d42900b3bce228f5d1.tar.gz
platform-system-core-527d80d945e7b53e53bcc4d42900b3bce228f5d1.tar.xz
platform-system-core-527d80d945e7b53e53bcc4d42900b3bce228f5d1.zip
Load default prop from /system/etc/prop.default
/default.prop is moved to /system/etc/prop.default for full Treblized devices. Modifies property_service to load it from there first. In recovery mode, the file is renamed as /prop.default. This path is tried if /system/etc/prop.default is not available. Bug: 37815285 Test: Tested with ag/2419001. Booted pixel phones, checked the location of prop.default, verified the symlink at /default.prop, checked a few properties via adb shell and manually tested a few apps. Booted to recovery and ran 'adb sideload' successfully. Change-Id: I485231f21fc86b0aec58edf867e229a31e77d85e
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/fs_config.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 221dea268..c39071cb0 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -134,7 +134,8 @@ static const struct fs_path_config android_files[] = {
134 { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" }, 134 { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" },
135 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" }, 135 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" },
136 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, 136 { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" },
137 { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, 137 { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy
138 { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" },
138 { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, 139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" },
139 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, 140 { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },
140 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, 141 { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },