forked from qt-creator/qt-creator
Remove adb daemon logs
If adb daemon is not started, adb devices command will add two lines to the output, messing up the devices list. Change-Id: I40dcf586d2661df2de0a56aaac543c3b4739ab0d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -457,7 +457,12 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices(QString *erro
|
|||||||
return devices;
|
return devices;
|
||||||
}
|
}
|
||||||
QList<QByteArray> adbDevs = adbProc.readAll().trimmed().split('\n');
|
QList<QByteArray> adbDevs = adbProc.readAll().trimmed().split('\n');
|
||||||
adbDevs.removeFirst();
|
if (adbDevs.empty())
|
||||||
|
return devices;
|
||||||
|
|
||||||
|
while (adbDevs.first().startsWith("* daemon"))
|
||||||
|
adbDevs.removeFirst(); // remove the daemon logs
|
||||||
|
adbDevs.removeFirst(); // remove "List of devices attached" header line
|
||||||
|
|
||||||
// workaround for '????????????' serial numbers:
|
// workaround for '????????????' serial numbers:
|
||||||
// can use "adb -d" when only one usb device attached
|
// can use "adb -d" when only one usb device attached
|
||||||
@@ -578,7 +583,13 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::androidVirtualDevices() const
|
|||||||
return devices;
|
return devices;
|
||||||
}
|
}
|
||||||
QList<QByteArray> avds = proc.readAll().trimmed().split('\n');
|
QList<QByteArray> avds = proc.readAll().trimmed().split('\n');
|
||||||
avds.removeFirst();
|
if (avds.empty())
|
||||||
|
return devices;
|
||||||
|
|
||||||
|
while (avds.first().startsWith("* daemon"))
|
||||||
|
avds.removeFirst(); // remove the daemon logs
|
||||||
|
avds.removeFirst(); // remove "List of devices attached" header line
|
||||||
|
|
||||||
AndroidDeviceInfo dev;
|
AndroidDeviceInfo dev;
|
||||||
for (int i = 0; i < avds.size(); i++) {
|
for (int i = 0; i < avds.size(); i++) {
|
||||||
QString line = QLatin1String(avds[i]);
|
QString line = QLatin1String(avds[i]);
|
||||||
|
|||||||
Reference in New Issue
Block a user