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.

1 files changed, 10 insertions, 2 deletions

diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
index 47a4ee608..b06f9c3ad 100644
--- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
+++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -165,6 +165,7 @@ public final class NewSearchFragment extends Fragment
 
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle bundle) {
+    LogUtil.i("NewSearchFragment.onCreateLoader", "loading cursor: " + id);
     if (id == CONTACTS_LOADER_ID) {
       return new SearchContactsCursorLoader(getContext(), query);
     } else if (id == NEARBY_PLACES_LOADER_ID) {
@@ -187,6 +188,7 @@ public final class NewSearchFragment extends Fragment
 
   @Override
   public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+    LogUtil.i("NewSearchFragment.onLoadFinished", "Loader finished: " + loader);
     if (cursor != null
         && !(loader instanceof RemoteDirectoriesCursorLoader)
         && !(cursor instanceof SearchCursor)) {
@@ -218,8 +220,14 @@ public final class NewSearchFragment extends Fragment
 
   @Override
   public void onLoaderReset(Loader<Cursor> loader) {
-    adapter.clear();
-    recyclerView.setAdapter(null);
+    LogUtil.i("NewSearchFragment.onLoaderReset", "Loader reset: " + loader);
+    if (loader instanceof SearchContactsCursorLoader) {
+      adapter.setContactsCursor(null);
+    } else if (loader instanceof NearbyPlacesCursorLoader) {
+      adapter.setNearbyPlacesCursor(null);
+    } else if (loader instanceof RemoteContactsCursorLoader) {
+      adapter.setRemoteContactsCursor(null);
+    }
   }
 
   public void setQuery(String query, CallInitiationType.Type callInitiationType) {