commit fd4cd95c78224bedac2a1efd9d6861678b1653e2
author Jay Shrauner <shrauner@google.com> Mon Mar 03 23:21:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 23:21:23 2014 +0000
tree 1d68796acd5934782788cf2916cbcf584d7dd3dc
parent a12a634a7d258a0297b9175ca0bf52dcbe14c210
parent beb720db32e1c6b26e3fa3001dc25352ad564f17

am beb720db: am 47c66ed1: am c2c2b63a: am a84d34e8: am 32ddc833: Merge "Protect against class cast exception" into klp-dev

* commit 'beb720db32e1c6b26e3fa3001dc25352ad564f17':
  Protect against class cast exception

src/com/android/dialer/list/PhoneFavoriteFragment.java

diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 04611b4..81d9bfd 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -541,7 +541,8 @@
                     final View child = mListView.getChildAt(i);
                     int position = firstVisiblePosition + i;
                     final int itemViewType = mAdapter.getItemViewType(position);
-                    if (itemViewType == PhoneFavoritesTileAdapter.ViewTypes.TOP) {
+                    if (itemViewType == PhoneFavoritesTileAdapter.ViewTypes.TOP &&
+                            child instanceof ContactTileRow) {
                         // This is a tiled row, so perform horizontal animations instead
                         performHorizontalAnimations((ContactTileRow) child, (
                                 ArrayList<ContactEntry>) mAdapter.getItem(position), idsInPlace);