resolve merge conflicts of c4cd6b8 to master.

Change-Id: I70618406a84d8482bf55f243600298e8761153ad

3 files changed, 8 insertions, 4 deletions

diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java
index 8d51dc19a4e..0fe29fa867e 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSource.java
@@ -7,6 +7,8 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.persistence.database.DataSourceInfo;
+import com.intellij.persistence.database.DataSourceTemplate;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ui.classpath.SimpleClasspathElement;
 import com.intellij.util.ui.classpath.SimpleClasspathElementFactory;
@@ -220,4 +222,4 @@ class AndroidDataSource extends LocalDataSource implements DataSourceInfo, Modif
       myClasspathElements = classpathElements;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
index 4a1207f9468..96e0c00462d 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
@@ -8,6 +8,8 @@ import com.android.tools.idea.ddms.DeviceComboBoxRenderer;
 import com.intellij.database.dataSource.AbstractDataSourceConfigurable;
 import com.intellij.database.dataSource.DatabaseDriver;
 import com.intellij.facet.ProjectFacetManager;
+import com.intellij.javaee.dataSource.AbstractDataSourceConfigurable;
+import com.intellij.javaee.dataSource.DatabaseDriver;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
@@ -357,8 +359,7 @@ public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigu
   public void apply() {
     saveData(myDataSource);
 
-    boolean canConnect = StringUtil.isNotEmpty(myDataSource.getState().getDeviceId());
-    if (canConnect) {
+    if (DbImplUtil.canConnectTo(myDataSource)) {
       AndroidSynchronizeHandler.doSynchronize(myProject, Collections.singletonList(myDataSource));
     }
 
diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDbUtil.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDbUtil.java
index 89826a7e0cc..23d8ad291a6 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDbUtil.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDbUtil.java
@@ -374,7 +374,8 @@ class AndroidDbUtil {
   @Nullable
   public static String getDeviceId(@NotNull IDevice device) {
     if (device.isEmulator()) {
-      return DEVICE_ID_EMULATOR_PREFIX + replaceByDirAllowedName(device.getAvdName());
+      String avdName = device.getAvdName();
+      return avdName == null ? null : DEVICE_ID_EMULATOR_PREFIX + replaceByDirAllowedName(avdName);
     }
     else {
       final String serialNumber = device.getSerialNumber();