From 006ae18b7b0f3e5d8b6ce80a5cac365ee9b226fd Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 13 May 2011 11:16:07 -0700
Subject: Remove account adding from getBookmarksUri

 Omnibox now searches all accounts

Change-Id: I8b4fbed5efd420f787648340e8c1e9d82d60b24c
---
 src/com/android/browser/BookmarkUtils.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/com/android/browser/BookmarkUtils.java')

diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java
index 3aaf5d4f7..383dc7e7b 100644
--- a/src/com/android/browser/BookmarkUtils.java
+++ b/src/com/android/browser/BookmarkUtils.java
@@ -25,7 +25,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -42,7 +41,6 @@ import android.os.Message;
 import android.preference.PreferenceManager;
 import android.provider.Browser;
 import android.provider.BrowserContract;
-import android.util.DisplayMetrics;
 
 public class BookmarkUtils {
     private final static String LOGTAG = "BookmarkUtils";
@@ -218,10 +216,10 @@ public class BookmarkUtils {
     }
 
     /* package */ static Uri getBookmarksUri(Context context) {
-        return addAccountInfo(context,
-                BrowserContract.Bookmarks.CONTENT_URI.buildUpon()).build();
+        return BrowserContract.Bookmarks.CONTENT_URI;
     }
 
+    @Deprecated
     public static Uri.Builder addAccountInfo(Context context, Uri.Builder ub) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null);
-- 
cgit v1.2.3