commit bd34f7dbbb25059121c2eb9f0d3d8478d78e7e63
author Android (Google) Code Review <android-gerrit@google.com> Thu Jun 04 10:52:24 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 04 10:52:24 2009 -0700
tree 3bc0f28dd7c033e151acac317e161d71c0abdb6e
parent bc5b9f358a2b75bf3a104b9f5cd477ad2f6f740f
parent 9768ac5e32b9daeeac0d41b119081bdf4c66bc54

Merge change 3134 into donut

* changes:
  Change the default client id for better stats

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 564620e..53814f2 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -914,6 +914,7 @@
         // URLs and site specific search shortcuts are handled by the regular flow of control, so
         // return early.
         if (Regex.WEB_URL_PATTERN.matcher(url).matches()
+                || ACCEPTED_URI_SCHEMA.matcher(url).matches()
                 || parseUrlShortcut(url) != SHORTCUT_INVALID) {
             return false;
         }
@@ -3460,7 +3461,7 @@
 
         @Override
         public void onReceivedTitle(WebView view, String title) {
-            String url = view.getOriginalUrl();
+            String url = view.getUrl();
 
             // here, if url is null, we want to reset the title
             setUrlTitle(url, title);