feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Make refresh action device specific

Browse Source 
Change-Id: I18386ad88e04696068f5f127cadb7ffcc6f25a56
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-09-26 23:06:00 +03:00
parent 12bc192422
commit affe3ccf51
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/android/androiddevice.cpp
View File

@@ -151,8 +151,9 @@ AndroidDevice::AndroidDevice()
setOsType(Utils::OsTypeOtherUnix); setOsType(Utils::OsTypeOtherUnix);
setDeviceState(DeviceConnected); setDeviceState(DeviceConnected);
addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &, QWidget *) { addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) {
AndroidDeviceManager::instance()->updateDevicesListOnce(); Q_UNUSED(parent)
AndroidDeviceManager::instance()->updateDeviceState(device);
}}); }});
addEmulatorActionsIfNotFound(); addEmulatorActionsIfNotFound();
@@ -448,6 +449,28 @@ void AndroidDeviceManager::updateDevicesListOnce()
} }
} }
void AndroidDeviceManager::updateDeviceState(const ProjectExplorer::IDevice::Ptr &device)
{
const AndroidDevice *dev = static_cast<AndroidDevice *>(device.data());
const QString serial = dev->serialNumber();
DeviceManager *const devMgr = DeviceManager::instance();
const Utils::Id id = dev->id();
if (serial.isEmpty() && dev->machineType() == IDevice::Emulator) {
devMgr->setDeviceState(id, IDevice::DeviceConnected);
return;
}
const QStringList args = AndroidDeviceInfo::adbSelector(serial) << "shell" << "echo" << "1";
const SdkToolResult result = AndroidManager::runAdbCommand(args);
const int success = result.success();
if (success)
devMgr->setDeviceState(id, IDevice::DeviceReadyToUse);
else if (dev->machineType() == IDevice::Emulator || result.stdErr().contains("unauthorized"))
devMgr->setDeviceState(id, IDevice::DeviceConnected);
else
devMgr->setDeviceState(id, IDevice::DeviceDisconnected);
}
void AndroidDeviceManager::startAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent) void AndroidDeviceManager::startAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent)
{ {
Q_UNUSED(parent) Q_UNUSED(parent)

1
src/plugins/android/androiddevice.h
View File

@@ -101,6 +101,7 @@ public:
void setupDevicesWatcher(); void setupDevicesWatcher();
void updateDevicesList(); void updateDevicesList();
void updateDevicesListOnce(); void updateDevicesListOnce();
void updateDeviceState(const ProjectExplorer::IDevice::Ptr &device);
void startAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr); void startAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr);
void eraseAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr); void eraseAvd(const ProjectExplorer::IDevice::Ptr &device, QWidget *parent = nullptr);