summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/calllog/database
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android/dialer/calllog/database')
-rw-r--r--java/com/android/dialer/calllog/database/Coalescer.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java
index 3c2585e01..b10dea24a 100644
--- a/java/com/android/dialer/calllog/database/Coalescer.java
+++ b/java/com/android/dialer/calllog/database/Coalescer.java
@@ -156,6 +156,10 @@ public class Coalescer {
return false;
}
+ if (!meetsAssistedDialingCriteria(row1, row2)) {
+ return false;
+ }
+
DialerPhoneNumber number1;
DialerPhoneNumber number2;
try {
@@ -172,15 +176,6 @@ public class Coalescer {
} catch (InvalidProtocolBufferException e) {
throw Assert.createAssertionFailException("error parsing DialerPhoneNumber proto", e);
}
-
- if (!number1.hasDialerInternalPhoneNumber() || !number2.hasDialerInternalPhoneNumber()) {
- // An empty number should not be combined with any other number.
- return false;
- }
-
- if (!meetsAssistedDialingCriteria(row1, row2)) {
- return false;
- }
return dialerPhoneNumberUtil.isMatch(number1, number2);
}