Bug 860326 - Don't update BrowserToolbar after editing a top site on about:home. r=wesj

mobile/android/base/BrowserApp.java

@@ -801,7 +801,12 @@ abstract public class BrowserApp extends GeckoApp
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        String url = resultCode == Activity.RESULT_OK ? data.getStringExtra(AwesomeBar.URL_KEY) : null;
+        String url = null;
+        // Don't update the url in the toolbar if the activity was just launched to pick a site.
+        boolean pickSite = data.getStringExtra(AwesomeBar.TARGET_KEY).equals(AwesomeBar.Target.PICK_SITE.toString());
+        if (resultCode == Activity.RESULT_OK && !pickSite) {
+            url = data.getStringExtra(AwesomeBar.URL_KEY);
+        }
         mBrowserToolbar.fromAwesomeBarSearch(url);
     }