Commit: a34d119057f1d62e6a6158fd682bcd4732b05cf6 - system-core (git)

system/core

Commit MetaInfo

• Revision: a34d119057f1d62e6a6158fd682bcd4732b05cf6 (tree)
• Time: 2019-03-28 19:36:04
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

fs_mgr: check ro.* property first

fs_mgr reads default fstab via ro.hardware property before Android 8.0.
However, Android 8.0 changed it to use ro.boot.hardware. The incompatible
change is bad.

Android-x86 doesn't set ro.boot.hardware anymore. Let's check ro.*
properties as before.

Change Summary

• modified: fs_mgr/fs_mgr_boot_config.cpp

Incremental Difference

--- a/fs_mgr/fs_mgr_boot_config.cpp
+++ b/fs_mgr/fs_mgr_boot_config.cpp
@@ -51,7 +51,13 @@ bool fs_mgr_get_boot_config_from_kernel_cmdline(const std::string& key, std::str
 bool fs_mgr_get_boot_config(const std::string& key, std::string* out_val) {
     FS_MGR_CHECK(out_val != nullptr);
 
-    // first check if we have "ro.boot" property already
+    // first check if we have "ro.*" property already
+    *out_val = android::base::GetProperty("ro." + key, "");
+    if (!out_val->empty()) {
+        return true;
+    }
+
+    // second check if we have "ro.boot.*" property
     *out_val = android::base::GetProperty("ro.boot." + key, "");
     if (!out_val->empty()) {
         return true;