Enhance AVD system image repair logic with validation checks and macOS uninstall/install retry mechanism

Author: mdshakib007

Framework/install_handler/android/emulator.py

@@ -215,16 +215,31 @@ async def _repair_avd_system_image_if_needed(avd_name: str, sdk_root: Path) -> b
     if not package:
         return False
 
+    def _is_system_image_dir_valid(path: Path) -> bool:
+        """
+        Emulator needs a fully formed system-image package, not just a folder.
+        package.xml is the key marker; *.img files indicate extracted payload.
+        """
+        if not path.exists() or not path.is_dir():
+            return False
+        package_xml = path / "package.xml"
+        if not package_xml.exists():
+            return False
+        if any(path.glob("*.img")):
+            return True
+        # Some packages include nested image files; accept if known metadata exists.
+        source_properties = path / "source.properties"
+        return source_properties.exists()
+
     expected_dir = sdk_root / package.replace(";", "/")
-    if expected_dir.exists() and expected_dir.is_dir():
+    if _is_system_image_dir_valid(expected_dir):
         return False
 
     sdkmanager = _find_sdkmanager(sdk_root)
     if not sdkmanager:
         return False
 
-    if debug:
-        print(f"[installer][emulator] Repairing missing system image for '{avd_name}': {package}")
+    print(f"[installer][emulator] Repairing invalid/missing system image for '{avd_name}': {package}")
 
     loop = asyncio.get_event_loop()
     if _is_windows():
@@ -259,9 +274,46 @@ async def _repair_avd_system_image_if_needed(avd_name: str, sdk_root: Path) -> b
         )
 
     if not success:
+        print(f"[installer][emulator] System image repair install command failed for package: {package}")
         return False
 
-    return expected_dir.exists() and expected_dir.is_dir()
+    # If package still looks invalid, force reinstall by uninstalling first on macOS.
+    if _is_darwin() and not _is_system_image_dir_valid(expected_dir):
+        env = _build_android_process_env(sdk_root)
+        uninstall_cmd = [str(sdkmanager), f"--sdk_root={sdk_root}", "--uninstall", package]
+        install_cmd = [str(sdkmanager), f"--sdk_root={sdk_root}", package]
+        try:
+            print(f"[installer][emulator] Retrying repair via uninstall+install for package: {package}")
+            await loop.run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    uninstall_cmd,
+                    capture_output=True,
+                    text=True,
+                    timeout=600,
+                    env=env
+                )
+            )
+            await loop.run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    install_cmd,
+                    capture_output=True,
+                    text=True,
+                    timeout=1800,
+                    env=env
+                )
+            )
+        except Exception as e:
+            print(f"[installer][emulator] uninstall+install repair failed: {e}")
+            return False
+
+    repaired = _is_system_image_dir_valid(expected_dir)
+    if repaired:
+        print(f"[installer][emulator] System image repair succeeded for package: {package}")
+    else:
+        print(f"[installer][emulator] System image directory is still invalid after repair: {expected_dir}")
+    return repaired
 
 
 def _get_host_arch() -> str:
@@ -491,8 +543,16 @@ async def _attempt_launch(cmd: list[str], wait_seconds: int, attempt_label: str)
         if returncode is not None and _is_darwin():
             launch_hint = _read_file_tail(log_path).lower()
             if "not a valid directory" in launch_hint and "system-images" in launch_hint:
-                if debug:
-                    print("[installer][emulator] Launch failed due missing system-image directory. Attempting auto-repair.")
+                print("[installer][emulator] Launch failed due invalid system-image directory. Attempting auto-repair.")
+                await send_response({
+                    "action": "status",
+                    "data": {
+                        "category": "AndroidEmulator",
+                        "name": avd_name,
+                        "status": "installing",
+                        "comment": "Repairing Android system image for this emulator...",
+                    }
+                })
                 repaired = await _repair_avd_system_image_if_needed(avd_name, sdk_root)
                 if repaired:
                     await _wait_for_avd_disk_ready(avd_name, timeout_seconds=12)