fix: restore global mod_device suffix and remove provision workaround

Author: toraidl

devices/common/props_global.json

@@ -30,6 +30,10 @@
         "ro.product.mod_device": "{base_code}_xiaomieu_global",
         "ro.build.host": "xiaomi.eu"
     },
+    "global_rom": {
+        "ro.product.mod_device": "{global_mod_device}",
+        "ro.build.host": "{build_host}"
+    },
     "cn_rom": {
         "ro.product.mod_device": "{base_code}",
         "ro.build.host": "{build_host}"

devices/common/replacements.json

@@ -103,18 +103,6 @@
             "condition_port_os_version_incremental_gte": "OS3.0.0",
             "condition_base_android_version_gte": 15,
             "condition_base_android_version_lt": 16
-        },
-        {
-            "description": "CN stock to global (non-EU) copy Provision app",
-            "id": "copy_provision_cn_to_global",
-            "fixme": "Temporary workaround: On CN hardware, using global Provision can get stuck on Setup Wizard WiFi page (returns to same page after connect/skip). Replacing with CN Provision mitigates the issue until root cause is fixed.",
-            "type": "file",
-            "search_path": "system_ext/priv-app",
-            "match_mode": "exact",
-            "ensure_exists": true,
-            "files": ["Provision"],
-            "condition_is_port_global_rom": true,
-            "condition_stock_region": "cn"
         }
     ]
 }

src/core/props.py

@@ -290,13 +290,22 @@ def _update_general_info(self):
         # 1. Common
         replacements = config.get("common", {})
 
-        # 2. EU vs CN
+        # 2. EU vs Global vs CN
         is_eu = getattr(self.ctx, "is_port_eu_rom", False)
+        is_global = getattr(self.ctx, "is_port_global_rom", False) and not is_eu
         if is_eu:
             replacements.update(config.get("eu_rom", {}))
+        elif is_global:
+            replacements.update(config.get("global_rom", {}))
         else:
             replacements.update(config.get("cn_rom", {}))
 
+        global_region = (getattr(self.ctx, "port_global_region", "") or "").strip().lower()
+        if global_region and global_region != "global":
+            global_mod_device = f"{base_code}_{global_region}_global"
+        else:
+            global_mod_device = f"{base_code}_global"
+
         # Format values (Placeholder replacement)
         fmt_map = {
             "build_date": build_date,
@@ -305,6 +314,8 @@ def _update_general_info(self):
             "rom_version": rom_version,
             "build_user": self.build_user,
             "build_host": self.build_host,
+            "global_region": global_region,
+            "global_mod_device": global_mod_device,
         }
 
         # Build final key-value map for processing

tests/core/test_props_mod_device_global.py

@@ -0,0 +1,79 @@
+import logging
+from types import SimpleNamespace
+
+# Ensure modifier package is initialized before importing PropertyModifier.
+import src.core.modifiers  # noqa: F401
+from src.core.props import PropertyModifier
+
+
+def _write_minimal_props_global_json(tmp_path):
+    devices_common = tmp_path / "devices" / "common"
+    devices_common.mkdir(parents=True, exist_ok=True)
+    (devices_common / "props_global.json").write_text(
+        """{
+  "common": {},
+  "eu_rom": {
+    "ro.product.mod_device": "{base_code}_xiaomieu_global"
+  },
+  "global_rom": {
+    "ro.product.mod_device": "{global_mod_device}"
+  },
+  "cn_rom": {
+    "ro.product.mod_device": "{base_code}"
+  }
+}
+""",
+        encoding="utf-8",
+    )
+
+
+def _build_ctx(tmp_path, *, is_port_eu_rom, is_port_global_rom, port_global_region):
+    target_dir = tmp_path / "target"
+    target_dir.mkdir(parents=True, exist_ok=True)
+    return SimpleNamespace(
+        target_dir=target_dir,
+        stock_rom_code="pudding",
+        target_rom_version="OS2.0.0.TEST",
+        is_port_eu_rom=is_port_eu_rom,
+        is_port_global_rom=is_port_global_rom,
+        port_global_region=port_global_region,
+    )
+
+
+def _run_update_and_read_mod_device(tmp_path, ctx):
+    prop_file = ctx.target_dir / "build.prop"
+    prop_file.write_text("ro.product.mod_device=old_value\n", encoding="utf-8")
+    modifier = PropertyModifier(ctx, logger=logging.getLogger("test.props.mod_device"))
+    modifier._update_general_info()
+    for line in prop_file.read_text(encoding="utf-8").splitlines():
+        if line.startswith("ro.product.mod_device="):
+            return line.split("=", 1)[1]
+    raise AssertionError("ro.product.mod_device was not found after update")
+
+
+def test_update_general_info_preserves_global_region_suffix_for_mod_device(tmp_path, monkeypatch):
+    _write_minimal_props_global_json(tmp_path)
+    monkeypatch.chdir(tmp_path)
+    ctx = _build_ctx(
+        tmp_path,
+        is_port_eu_rom=False,
+        is_port_global_rom=True,
+        port_global_region="tw",
+    )
+
+    value = _run_update_and_read_mod_device(tmp_path, ctx)
+    assert value == "pudding_tw_global"
+
+
+def test_update_general_info_uses_generic_global_suffix_when_region_missing(tmp_path, monkeypatch):
+    _write_minimal_props_global_json(tmp_path)
+    monkeypatch.chdir(tmp_path)
+    ctx = _build_ctx(
+        tmp_path,
+        is_port_eu_rom=False,
+        is_port_global_rom=True,
+        port_global_region="",
+    )
+
+    value = _run_update_and_read_mod_device(tmp_path, ctx)
+    assert value == "pudding_global"