diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-20 01:18:51 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-20 01:18:52 +0000 |
commit | f3ec8ad515ec344acd53fa4acaa9df4cad0c2306 (patch) | |
tree | 557ead47e7e583cb8b37b8c4a9cb9cf664d0ae15 /src/com/android/dialer/calllog/CallLogAdapter.java | |
parent | 03aaf3894d8af53f241d1189c504e44c538100d4 (diff) | |
parent | 053b9c7a4b2662588706211fd8aa1f8a03ec2901 (diff) |
Merge "Rewrite of MediaPlayer logic." into mnc-dev
Diffstat (limited to 'src/com/android/dialer/calllog/CallLogAdapter.java')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 5738e977f..921ec506c 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -117,8 +117,10 @@ public class CallLogAdapter extends GroupingListAdapter return; } - // Always reset the voicemail playback state on expand or collapse. - mVoicemailPlaybackPresenter.reset(); + if (mVoicemailPlaybackPresenter != null) { + // Always reset the voicemail playback state on expand or collapse. + mVoicemailPlaybackPresenter.reset(); + } if (viewHolder.getAdapterPosition() == mCurrentlyExpandedPosition) { // Hide actions, if the clicked item is the expanded item. |