diff options
| author | Arnaud Berry <arnaudberry@google.com> | 2021-11-11 01:06:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-11 01:06:41 +0000 |
| commit | 192c570e834ad5f611f9b0d9ffa8ba672aca594c (patch) | |
| tree | 64430c6cdef2f45d7cea94e2fb999f0121a86554 | |
| parent | cf8c6c4e35ffac0bd8593e29dad10e138050cb2f (diff) | |
| parent | 9a11a1d9731fa04b517a625457ecc86962a64547 (diff) | |
| download | Cluster-192c570e834ad5f611f9b0d9ffa8ba672aca594c.tar.gz | |
Merge car-arch-common into car-apps-comm am: da323c48ad am: 9a11a1d973
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Cluster/+/16216163
Change-Id: Ifeb5d1bf53308dac719d03ab69eb608a1f41593c
| -rw-r--r-- | DirectRenderingCluster/Android.bp | 1 | ||||
| -rw-r--r-- | DirectRenderingCluster/src/android/car/cluster/MusicFragmentViewModel.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/DirectRenderingCluster/Android.bp b/DirectRenderingCluster/Android.bp index da7d3e3..3830547 100644 --- a/DirectRenderingCluster/Android.bp +++ b/DirectRenderingCluster/Android.bp @@ -40,7 +40,6 @@ android_app { "android.car.cluster.navigation", "androidx.legacy_legacy-support-v4", "androidx-constraintlayout_constraintlayout", - "car-arch-common", "car-media-common", "car-telephony-common", "car-apps-common", diff --git a/DirectRenderingCluster/src/android/car/cluster/MusicFragmentViewModel.java b/DirectRenderingCluster/src/android/car/cluster/MusicFragmentViewModel.java index 9fb0fa4..0096daf 100644 --- a/DirectRenderingCluster/src/android/car/cluster/MusicFragmentViewModel.java +++ b/DirectRenderingCluster/src/android/car/cluster/MusicFragmentViewModel.java @@ -15,7 +15,7 @@ */ package android.car.cluster; -import static com.android.car.arch.common.LiveDataFunctions.mapNonNull; +import static com.android.car.apps.common.util.LiveDataFunctions.mapNonNull; import android.app.Application; import android.graphics.Bitmap; |