commit 6c22ce6345908c258b9e5043a166229b15653b03
author John Reck <jreck@google.com> Thu Jan 06 16:22:48 2011 -0800
committer John Reck <jreck@google.com> Fri Jan 07 13:29:05 2011 -0800
tree f011159558e65c9ef914daa3b62e69bdbc1f3919
parent 2aa69dc95b206a0fc396d379c31a7e49c60d455e

DO NOT MERGE - Fixes account_* URI handling in BP2

 Cherry pick from master

 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: Ic633d2dcb4c04d51aabffb504a57f08f83de08cb

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();
     }
 }