diff options
| author | John Reck <jreck@google.com> | 2011-01-06 16:22:48 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-01-07 13:29:05 -0800 |
| commit | 6c22ce6345908c258b9e5043a166229b15653b03 (patch) | |
| tree | f011159558e65c9ef914daa3b62e69bdbc1f3919 /src/com/android/browser/BrowserHistoryPage.java | |
| parent | 2aa69dc95b206a0fc396d379c31a7e49c60d455e (diff) | |
| download | packages_apps_Browser-6c22ce6345908c258b9e5043a166229b15653b03.zip packages_apps_Browser-6c22ce6345908c258b9e5043a166229b15653b03.tar.gz packages_apps_Browser-6c22ce6345908c258b9e5043a166229b15653b03.tar.bz2 | |
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
Diffstat (limited to 'src/com/android/browser/BrowserHistoryPage.java')
| -rw-r--r-- | src/com/android/browser/BrowserHistoryPage.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java index d8e8177..41d3749 100644 --- a/src/com/android/browser/BrowserHistoryPage.java +++ b/src/com/android/browser/BrowserHistoryPage.java @@ -126,10 +126,8 @@ public class BrowserHistoryPage extends Fragment String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null); Uri.Builder combinedBuilder = Combined.CONTENT_URI.buildUpon(); - if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountName)) { - combinedBuilder.appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType); - combinedBuilder.appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME, accountName); - } + combinedBuilder.appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType); + combinedBuilder.appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME, accountName); switch (id) { case LOADER_HISTORY: { |