tree 194dcaa351a45f1d7e01f16781498d6b2292aaf3
parent 70dfe7593dec7e68ae6215b64c4afc78d963669c
author Elif Bilgin <elifbilgin@google.com> 1609279016 -0800
committer Daniel Santiago Rivera <danysantiago@google.com> 1610432658 -0800

Use the ON_CONFLICT strategy when keying DeleteOrUpdateAdapters.

The DeleteOrUpdateAdapters are recycled between Dao methods when they use the same entity. This change adds the conflict strategy used in the shortcut method as part of the key used to recycle the adapters, this is important since the conflict strategy changes the shortcut method behaviour.

Test: DaoConflictStrategyTest.java
Bug: 176138543
Change-Id: I0b90daccfbfe784cd44c507d05edf84e6ba80052