Snap for 5876498 from 6fb0e25e1eb70de5c46110c5a0cbe75f8b98c936 to qt-qpr1-release
Change-Id: I88c59b0a4894b7b942dbce57921df613f2e03b35
diff --git a/Android.mk b/Android.mk
index b3352d9..81de821 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,11 +43,7 @@
LOCAL_JAVA_LIBRARIES += android.car
LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.lifecycle_lifecycle-livedata \
- androidx.sqlite_sqlite-framework \
- androidx.sqlite_sqlite \
- car-androidx-room-common-nodeps \
- car-androidx-room-runtime-nodeps
+ androidx.lifecycle_lifecycle-livedata
LOCAL_ANNOTATION_PROCESSORS := \
car-androidx-annotation-nodeps \
@@ -74,6 +70,7 @@
LOCAL_STATIC_ANDROID_LIBRARIES += \
androidx-constraintlayout_constraintlayout \
+ androidx.room_room-runtime \
car-apps-common \
car-media-common \
car-broadcastradio-support
diff --git a/src/com/android/car/radio/storage/RadioDatabase.java b/src/com/android/car/radio/storage/RadioDatabase.java
index d237f45..ae26bf1 100644
--- a/src/com/android/car/radio/storage/RadioDatabase.java
+++ b/src/com/android/car/radio/storage/RadioDatabase.java
@@ -66,8 +66,10 @@
protected abstract FavoriteDao favoriteDao();
public static RadioDatabase buildInstance(Context context) {
- return Room.databaseBuilder(context.getApplicationContext(),
- RadioDatabase.class, RadioDatabase.class.getSimpleName()).build();
+ return Room.databaseBuilder(context.getApplicationContext(), RadioDatabase.class,
+ RadioDatabase.class.getSimpleName())
+ .enableMultiInstanceInvalidation()
+ .build();
}
/**
