DeviceKitInformation: Warn if something goes wrong

Change-Id: I23bb33a1415dd11e0dafc3d2b7dfa4e391fdcd87
Reviewed-by: Tobias Hunger <[email protected]>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index b1a67572ab3..3b594746353 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -74,14 +74,15 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
     addAutoReleasedObject(new Internal::AndroidDeployConfigurationFactory);
     addAutoReleasedObject(new Internal::AndroidDeviceFactory);
     ProjectExplorer::KitManager::instance()->registerKitInformation(new Internal::AndroidGdbServerKitInformation);
+
+    ProjectExplorer::DeviceManager::instance()
+            ->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));
     connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()),
             this, SLOT(kitsRestored()));
 }