Merge remote-tracking branch 'origin/dev' into dev

Author: CarterLi

src/detection/host/host_android.c

@@ -12,6 +12,7 @@ const char* ffDetectHost(FFHostResult* host)
         || ffSettingsGetAndroidProperty("ro.vivo.market.name", &host->name)
         || ffSettingsGetAndroidProperty("ro.product.oppo_model", &host->name)
         || ffSettingsGetAndroidProperty("ro.oppo.market.name", &host->name)
+        || ffSettingsGetAndroidProperty("ro.vendor.oplus.market.enname", &host->name)
         || ffSettingsGetAndroidProperty("ro.config.devicename", &host->name)
         || ffSettingsGetAndroidProperty("ro.config.marketing_name", &host->name)
         || ffSettingsGetAndroidProperty("ro.product.vendor.model", &host->name)