diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-11 21:22:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-11 21:22:26 +0000 |
| commit | d4d9fb5e6dcaa284c955d112f21cc420f0f7f3f2 (patch) | |
| tree | 4d0aa7d6f8a6ded1f9c71f2165113988c8872469 /java/com/android/dialer/calllog/database/Coalescer.java | |
| parent | 6e714e712a91f7eb3c12ed76ba2482e2714c2bc1 (diff) | |
| parent | b175d252b8801c4219343d7bff1b76ca1f2eb030 (diff) | |
Merge changes I6db36017,I0f0b44e5
* changes:
Add RTT badge to new call log.
Update logic for incoming and active calls.
Diffstat (limited to 'java/com/android/dialer/calllog/database/Coalescer.java')
| -rw-r--r-- | java/com/android/dialer/calllog/database/Coalescer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java index 6b1a9e1f5..5fdf0dfd9 100644 --- a/java/com/android/dialer/calllog/database/Coalescer.java +++ b/java/com/android/dialer/calllog/database/Coalescer.java @@ -203,6 +203,11 @@ public class Coalescer { return false; } + // A RTT call should not be combined with one that is not a RTT call. + if ((row1Features & Calls.FEATURES_RTT) != (row2Features & Calls.FEATURES_RTT)) { + return false; + } + return true; } |