summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-03-03 23:09:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-03 23:09:38 +0000
commita84d34e8806bce93ea50f367db1e3f7a2790c4f5 (patch)
treef94b8e78356693a08adde40f8fe4c28b98afe118
parentfe7a8f0e9efd3d7464184761b83d01ff883fa821 (diff)
parent32ddc8338f65c4caf2e6848ee80431211e758d9d (diff)
am 32ddc833: Merge "Protect against class cast exception" into klp-dev
* commit '32ddc8338f65c4caf2e6848ee80431211e758d9d': Protect against class cast exception
-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);