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/BookmarksLoader.java

diff --git a/src/com/android/browser/BookmarksLoader.java b/src/com/android/browser/BookmarksLoader.java
index 650c3ca..e2f8941 100644
--- a/src/com/android/browser/BookmarksLoader.java
+++ b/src/com/android/browser/BookmarksLoader.java
@@ -66,10 +66,7 @@
     }
 
     static Uri addAccount(Uri uri, String accountType, String accountName) {
-        if (!TextUtils.isEmpty(accountType) && !TextUtils.isEmpty(accountName)) {
-            return uri.buildUpon().appendQueryParameter(Bookmarks.PARAM_ACCOUNT_TYPE, accountType).
-                    appendQueryParameter(Bookmarks.PARAM_ACCOUNT_NAME, accountName).build();
-        }
-        return uri;
+        return uri.buildUpon().appendQueryParameter(Bookmarks.PARAM_ACCOUNT_TYPE, accountType).
+                appendQueryParameter(Bookmarks.PARAM_ACCOUNT_NAME, accountName).build();
     }
 }