Merge "Removed checks for null that introduced bug." into studio-1.4-dev automerge: a58b9f6

automerge: 82178ea

* commit '82178ea8c8cb42028d6be8767cdad1a496f26690':
  Removed checks for null that introduced bug.

1 files changed, 9 insertions, 6 deletions

diff --git a/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java b/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java
index 878e3af104b..226c834413e 100644
--- a/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java
+++ b/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java
@@ -43,7 +43,7 @@ import static com.android.SdkConstants.ANDROID_MANIFEST_XML;
  * Like {@link SourceProvider}, but for IntelliJ, which means it provides
  * {@link VirtualFile} references rather than {@link File} references.
  *
- * @see org.jetbrains.android.facet.AndroidSourceType
+ * @see AndroidSourceType
  */
 public abstract class IdeaSourceProvider {
   private IdeaSourceProvider() {
@@ -347,9 +347,10 @@ public abstract class IdeaSourceProvider {
       return Collections.singletonList(facet.getMainIdeaSourceProvider());
     }
     AndroidModel androidModel = facet.getAndroidModel();
-    assert androidModel != null;
-
-    return createAll(androidModel.getActiveSourceProviders());
+    if (androidModel != null) {
+      return createAll(androidModel.getActiveSourceProviders());
+    }
+    return Collections.emptyList();
   }
 
   @NotNull
@@ -358,8 +359,10 @@ public abstract class IdeaSourceProvider {
       return Collections.emptyList();
     }
     AndroidModel androidModel = facet.getAndroidModel();
-    assert androidModel != null;
-    return createAll(androidModel.getTestSourceProviders());
+    if (androidModel != null) {
+      return createAll(androidModel.getTestSourceProviders());
+    }
+    return Collections.emptyList();
   }
 
   private Collection<VirtualFile> getAllSourceFolders() {