commit 03b20541bdaba770c751db40ed9723d7c53b3fe5
author John Reck <jreck@google.com> Thu Jan 06 16:22:48 2011 -0800
committer John Reck <jreck@google.com> Thu Jan 06 16:28:56 2011 -0800
tree a08ec454a2adfa03410a54faed4303bdf72b755d
parent ede1cbcb8cce72d10af4467aaf6f09a6e84dcbcc

Fixes account_* URI handling in BP2

 Bug: 3329654
 Changes the handling of account_* URI parameters to allow requests
 to distinguish between no account_* filtering and filter to the
 default account.

Change-Id: I364f3f4398d077820b29bb7ddb17bba37429f21c

src/com/android/browser/BookmarkUtils.java

diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java
index f261cb3..b548607 100644
--- a/src/com/android/browser/BookmarkUtils.java
+++ b/src/com/android/browser/BookmarkUtils.java
@@ -206,12 +206,10 @@
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null);
         String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null);
-        if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountType)) {
-            ub.appendQueryParameter(
-                    BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME,accountName);
-            ub.appendQueryParameter(
-                    BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType);
-        }
+        ub.appendQueryParameter(
+                BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME,accountName);
+        ub.appendQueryParameter(
+                BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType);
         return ub;
     }
 }