Commit 87529e30 authored by Christian Kandeler's avatar Christian Kandeler Committed by Tobias Hunger
Browse files

Android: Do not instantiate the DeviceManager in initialize().



It is not guaranteed that all device creation factories have been set up
at that point, meaning that some devices will not be loaded from the
settings.

Change-Id: Ibce0e6c125980b1807efca4ce97693f9af7ab79a
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 889f16c3
......@@ -71,14 +71,15 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
addAutoReleasedObject(new Internal::AndroidToolChainFactory);
addAutoReleasedObject(new Internal::AndroidDeployConfigurationFactory);
addAutoReleasedObject(new Internal::AndroidDeviceFactory);
ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance();
if (dm->find(Core::Id(Constants::ANDROID_DEVICE_ID)).isNull())
dm->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice));
return true;
}
void AndroidPlugin::extensionsInitialized()
{ }
{
ProjectExplorer::DeviceManager *dm = ProjectExplorer::DeviceManager::instance();
if (dm->find(Core::Id(Constants::ANDROID_DEVICE_ID)).isNull())
dm->addDevice(ProjectExplorer::IDevice::Ptr(new Internal::AndroidDevice));
}
} // namespace Android
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment