diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-03-03 23:11:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-03 23:11:44 +0000 |
| commit | c2c2b63ad9d47b02a6c11b7af7d5fcd6e8411e62 (patch) | |
| tree | 1d68796acd5934782788cf2916cbcf584d7dd3dc | |
| parent | c0078359f1037459c7125c4e934beca1cc74e309 (diff) | |
| parent | a84d34e8806bce93ea50f367db1e3f7a2790c4f5 (diff) | |
am a84d34e8: am 32ddc833: Merge "Protect against class cast exception" into klp-dev
* commit 'a84d34e8806bce93ea50f367db1e3f7a2790c4f5':
Protect against class cast exception
| -rw-r--r-- | src/com/android/dialer/list/PhoneFavoriteFragment.java | 3 |
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); |