commit 97fbf664776f1aa8fc3e93608507e68f6698c955
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 26 22:34:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 22:34:24 2018 +0000
tree cdc0eb950253a3fac0c6835c841e268730e10545
parent 75c7bf73503444e4cbb99635391c36315e4f3341
parent e9b33714d52a3d028e0b9fff103beab1569d3ff1

Merge "Disable substitution of android.support to androidx project." into pi-preview1-androidx-dev

work/workmanager/src/main/java/androidx/work/impl/model/DependencyDao.java

diff --git a/work/workmanager/src/main/java/androidx/work/impl/model/DependencyDao.java b/work/workmanager/src/main/java/androidx/work/impl/model/DependencyDao.java
index 34ed149..602aba9 100644
--- a/work/workmanager/src/main/java/androidx/work/impl/model/DependencyDao.java
+++ b/work/workmanager/src/main/java/androidx/work/impl/model/DependencyDao.java
@@ -16,7 +16,7 @@
 
 package androidx.work.impl.model;
 
-import static android.arch.persistence.room.OnConflictStrategy.FAIL;
+import static android.arch.persistence.room.OnConflictStrategy.IGNORE;
 
 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Insert;
@@ -34,7 +34,7 @@
      *
      * @param dependency The {@link Dependency}s to insert
      */
-    @Insert(onConflict = FAIL)
+    @Insert(onConflict = IGNORE)
     void insertDependency(Dependency dependency);
 
     /**