Bug 1353001 - Fallback invoke ContentResolver.query without CancellationSignal, r=sebastian

MozReview-Commit-ID: 7d3lxiWs3uP

--HG--
extra : rebase_source : bb610154148bf9377bdfc1448018d651130f81b9

mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java

@@ -1980,7 +1980,7 @@ public class LocalBrowserDB extends BrowserDB {
                 .appendQueryParameter(BrowserContract.PARAM_LIMIT, String.valueOf(limit))
                 .build();
 
-        return contentResolver.query(uri, null, null, null, null, null);
+        return contentResolver.query(uri, null, null, null, null);
     }
 
     @Override

mobile/android/base/java/org/mozilla/gecko/home/BookmarksPanel.java

@@ -273,7 +273,7 @@ public class BookmarksPanel extends HomeFragment {
 
             if (GeckoSharedPrefs.forProfile(getContext()).getBoolean(GeckoPreferences.PREFS_READ_PARTNER_BOOKMARKS_PROVIDER, false)
                     && (isRootFolder || mFolderInfo.id <= Bookmarks.FAKE_PARTNER_BOOKMARKS_START)) {
-                partnerCursor = contentResolver.query(PartnerBookmarksProviderProxy.getUriForBookmarks(getContext(), mFolderInfo.id), null, null, null, null, null);
+                partnerCursor = contentResolver.query(PartnerBookmarksProviderProxy.getUriForBookmarks(getContext(), mFolderInfo.id), null, null, null, null);
             }
 
             if (isRootFolder || mFolderInfo.id > Bookmarks.FAKE_PARTNER_BOOKMARKS_START) {