commit 6b6f6c5b112fdb85d05f415bec9818d38b586b7a
author Mathew Inwood <mathewi@google.com> Thu Sep 08 04:01:32 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 08 04:01:32 2011 -0700
tree 25e5538f287a11de21a109240e0bc1f65817c260
parent 8c50177f20772ab52c9d6214a7da9e98e574c9de
parent 7590598c87d7e910df6567c377192e93c0e2f771

Merge "Change default preload setting to 'Always'."

src/com/android/browser/NavigationBarTablet.java

diff --git a/src/com/android/browser/NavigationBarTablet.java b/src/com/android/browser/NavigationBarTablet.java
index 661ed71..c22b1a0 100644
--- a/src/com/android/browser/NavigationBarTablet.java
+++ b/src/com/android/browser/NavigationBarTablet.java
@@ -249,6 +249,7 @@
     }
 
     private void stopOrRefresh() {
+        if (mUiController == null) return;
         if (mTitleBar.isInLoad()) {
             mUiController.stopLoading();
         } else {

src/com/android/browser/SuggestionsAdapter.java

diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index e1511b9..ca3754c 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -479,8 +479,6 @@
             Uri.Builder ub = OmniboxSuggestions.CONTENT_URI.buildUpon();
             ub.appendQueryParameter(BrowserContract.PARAM_LIMIT,
                     Integer.toString(Math.max(mLinesLandscape, mLinesPortrait)));
-            ub.appendQueryParameter(BrowserProvider2.PARAM_GROUP_BY,
-                    OmniboxSuggestions.URL);
             mCursor =
                     mContext.getContentResolver().query(ub.build(), COMBINED_PROJECTION,
                             selection, (constraint != null) ? args : null, null);

tests/src/com/android/browser/JNIBindingsTest.java

diff --git a/tests/src/com/android/browser/JNIBindingsTest.java b/tests/src/com/android/browser/JNIBindingsTest.java
index 8c25a80..ae694c9 100644
--- a/tests/src/com/android/browser/JNIBindingsTest.java
+++ b/tests/src/com/android/browser/JNIBindingsTest.java
@@ -213,8 +213,7 @@
     public boolean testJSPrimitivesToStringsInJava(String intParam, String nullParam,
             String doubleParam, String booleanParam, String charParam,
             String undefinedParam) {
-        // Since JS numbers are treated as doubles.
-        String expectedIntParam = "123.0";
+        String expectedIntParam = "123";
         String expectedDoubleParam = "456.789";
         String expectedBooleanParam = "true";
         String expectedCharParam = "d";