diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-09 02:15:46 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-09 02:15:46 +0000 |
commit | 128ecd2bcfd00cfb7c86a21874f7d0aa85b8127d (patch) | |
tree | d8114d34c5a4305460897f1587ddc303e80801d2 /java/com/android/dialer/app | |
parent | 1d3dbe88d986a315d98a1a7fd0350c248c182756 (diff) | |
parent | e332b103cacab1430bde7130dbfea1eebca30038 (diff) |
Merge changes I4f4f66f5,I77e7ff75
* changes:
Removed cast to DialtactsActivity.
Fix incall icon arrow color
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r-- | java/com/android/dialer/app/calllog/CallLogAdapter.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index a4479da9e..d3fd36520 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -54,7 +54,6 @@ import android.view.View; import android.view.ViewGroup; import com.android.contacts.common.ContactsUtils; import com.android.contacts.common.preference.ContactsPreferences; -import com.android.dialer.app.DialtactsActivity; import com.android.dialer.app.R; import com.android.dialer.app.calllog.CallLogFragment.CallLogFragmentListener; import com.android.dialer.app.calllog.CallLogGroupBuilder.GroupCreator; @@ -395,16 +394,15 @@ public class CallLogAdapter extends GroupingListAdapter if (viewHolder.callType == CallLog.Calls.MISSED_TYPE) { CallLogAsyncTaskUtil.markCallAsRead(activity, viewHolder.callIds); if (activityType == ACTIVITY_TYPE_DIALTACTS) { - if (v.getContext() instanceof MainActivityPeer.PeerSupplier) { - // This is really bad, but we must do this to prevent a dependency cycle, enforce - // best practices in new code, and avoid refactoring DialtactsActivity. - ((FragmentUtilListener) - ((MainActivityPeer.PeerSupplier) v.getContext()).getPeer()) - .getImpl(CallLogFragmentListener.class) - .updateTabUnreadCounts(); - } else { - ((DialtactsActivity) v.getContext()).updateTabUnreadCounts(); - } + Assert.checkState( + v.getContext() instanceof MainActivityPeer.PeerSupplier, + "%s is not a PeerSupplier", + v.getContext().getClass()); + // This is really bad, but we must do this to prevent a dependency cycle, enforce + // best practices in new code, and avoid refactoring DialtactsActivity. + ((FragmentUtilListener) ((MainActivityPeer.PeerSupplier) v.getContext()).getPeer()) + .getImpl(CallLogFragmentListener.class) + .updateTabUnreadCounts(); } } expandViewHolderActions(viewHolder); |