summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-03-03 23:07:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-03 23:07:05 +0000
commit32ddc8338f65c4caf2e6848ee80431211e758d9d (patch)
treee1349bdae24a3fbe6cf87e140d5495e35e2d56fa
parent243ab2f22eb25fd35a936e8a62808cad935bb510 (diff)
parentf8780c9a45b76bc6fe749a5a7d0063f4c1003cee (diff)
Merge "Protect against class cast exception" into klp-dev
-rw-r--r--src/com/android/dialer/list/PhoneFavoriteFragment.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 04611b4ec..81d9bfdc8 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -541,7 +541,8 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen
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);