Porting newer changes from 1599-qrd

  Fixes NULL pointer exception on crash recovery

    Browser registers JS interface during crash recovery for each tab.
    Some of tabs are not recovered (e.g. Incognito tabs). The code
    was setting the JS interface for these tabs as well, while the
    tab pointer was NULL.

    Change-Id: Ic0255d4b98eef694d7b1b0a92595332b88cca695

  Add javascript interface for 'def_landing_page'.

    Fix CR: 731360.

    Change-Id: I15f5de350cb4dd74198c4ca64f92a2d15f52068b

  Fixes issue seen on carrier's homepage.

  - When the user navigates from a carrier's homepage to any bookmark entry
    and goes back to homepage, the buttons on the homepage was not responsive.
    The issue was related to how JavascriptInterface was added to webview
    and required a reload of the page during page navigation.
    The issue is fixed by not removing the JavascriptInterface that was
    added to a webview when the user navigates from the carrier's homepage
    and granting access to the java methods of the addJavascriptInterface
    only if the URL is the carrier's homepage.

    Change-Id: Ie328f2c8dbb41869bffdaf840c93d560171e79fb

Change-Id: I17f34c19890197714e661638d028fc74bfc38529

1 files changed, 0 insertions, 3 deletions

diff --git a/src/com/android/browser/TabControl.java b/src/com/android/browser/TabControl.java
index da68b551..84330c13 100644
--- a/src/com/android/browser/TabControl.java
+++ b/src/com/android/browser/TabControl.java
@@ -423,9 +423,6 @@ class TabControl {
                     // sNextId to be set correctly.
                     continue;
                 }
-                //handle restored pages that may require a JS interface
-                t.handleJsInterface(t.getWebView(), t.getUrl());
-
                 tabMap.put(id, t);
                 // Me must set the current tab before restoring the state
                 // so that all the client classes are set.