diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-05 00:35:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-05 00:35:03 +0000 |
commit | 3a292c344c845f0620639c9eecdd5c3353ff5265 (patch) | |
tree | 3b8746686143df521d5bfec88c72c7e2668feb87 /java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java | |
parent | bc07ed7f31845b0565990999e90510c90e8dad9b (diff) | |
parent | 665bd416945c0c089f78d733e45d7532eb74f5b4 (diff) |
Merge changes I57e6e0b5,I8aa9d5a1,Id2faa542,I9c4bfd89
* changes:
Inserting post call notes now compares notifications using fuzzy matching.
Do not crash when LightbringerTech receives device orientation update
Copy directory list into new list to prevent modifications.
Remove 'learn more' link from verizon voicemail TOS text and using non-breaking space in dialer TOS 'learn more' link.
Diffstat (limited to 'java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java')
-rw-r--r-- | java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java b/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java index 5d80a452c..e9e83c19b 100644 --- a/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java +++ b/java/com/android/dialer/searchfragment/remote/RemoteContactsCursor.java @@ -60,7 +60,10 @@ public final class RemoteContactsCursor extends MergeCursor implements SearchCur public static RemoteContactsCursor newInstance( Context context, Cursor[] cursors, List<Directory> directories) { Assert.checkArgument( - cursors.length == directories.size(), "Directories and cursors must be the same size."); + cursors.length == directories.size(), + "Directories (%d) and cursors (%d) must be the same size.", + directories.size(), + cursors.length); Cursor[] cursorsWithHeaders = insertHeaders(context, cursors, directories); if (cursorsWithHeaders.length > 0) { return new RemoteContactsCursor(cursorsWithHeaders); |