Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/vscode-extension/src/devices/AndroidEmulatorDevice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import assert from "assert";
import { v4 as uuidv4 } from "uuid";
import { Disposable } from "vscode";
import { REBOOT_TIMEOUT } from "./DeviceBase";
import { cancellableRetry } from "../utilities/retry";
import { cancellableRetry, retry } from "../utilities/retry";
import { getAppCachesDir, getNativeABI, getOldAppCachesDir } from "../utilities/common";
import { ANDROID_HOME } from "../utilities/android";
import { ChildProcess, exec, lineReader } from "../utilities/subprocess";
Expand Down Expand Up @@ -379,6 +379,7 @@ export class AndroidEmulatorDevice extends AndroidDevice {
if (line.includes("Advertising in:")) {
const match = line.match(/Advertising in: (\S+)/);
const iniFile = match![1];
await waitForAvdIniFileToExist(iniFile);
const emulatorInfo = await parseAvdIniFile(iniFile);
const emulatorSerial = `emulator-${emulatorInfo.serialPort}`;
try {
Expand Down Expand Up @@ -675,6 +676,17 @@ async function parseAvdConfigIniFile(filePath: string) {
return { displayName, modelId, systemImageDir };
}

async function waitForAvdIniFileToExist(filePath: string) {
// Wait for emulator to write the ini file to disk
await retry(
async () => {
await fs.promises.access(filePath, fs.constants.R_OK);
},
5,
1000
);
}

async function parseAvdIniFile(filePath: string) {
const content = await fs.promises.readFile(filePath, "utf-8");

Expand Down
Loading