Fix issue when navigating on Snapshot Tab

- When navigating on snapshot tab, clicking on the links
  in the snapshot tab causes navigation in the same tab to occur
  This is wrong behaviour in terms of user experience and would
  also cause issues with Edge navigation

Change-Id: I9b2f7eb27aed0209f0245ab71ee69fe087eb9161

1 files changed, 6 insertions, 14 deletions

diff --git a/src/com/android/browser/SnapshotTab.java b/src/com/android/browser/SnapshotTab.java
index 7471bca9..c63bf102 100644
--- a/src/com/android/browser/SnapshotTab.java
+++ b/src/com/android/browser/SnapshotTab.java
@@ -49,7 +49,6 @@ public class SnapshotTab extends Tab {
     private long mDateCreated;
     private boolean mIsLive;
     private String mLiveUrl;
-    private Bundle mSavedState;
 
     // Used for saving and restoring each Tab
     static final String SNAPSHOT_ID = "snapshotId";
@@ -65,6 +64,7 @@ public class SnapshotTab extends Tab {
         WebView web = mWebViewFactory.createWebView(false);
         setWebView(web);
         loadData();
+        mIsLive = false;
     }
 
     @Override
@@ -125,10 +125,11 @@ public class SnapshotTab extends Tab {
             return super.saveState();
         }
 
-        mSavedState = new Bundle();
-        mSavedState = super.saveState();
-        mSavedState.putLong(SNAPSHOT_ID, mSnapshotId);
-        return mSavedState;
+        Bundle savedState = new Bundle();
+        savedState.putLong(SNAPSHOT_ID, mSnapshotId);
+        savedState.putLong(ID, getId());
+
+        return savedState;
     }
 
     public long getDateCreated() {
@@ -140,15 +141,6 @@ public class SnapshotTab extends Tab {
     }
 
     @Override
-    public void loadUrl(String url, Map<String, String> headers) {
-        if (!mIsLive) {
-            mIsLive = true;
-            getWebView().clearViewState();
-        }
-        super.loadUrl(url, headers);
-    }
-
-    @Override
     public boolean canGoBack() {
         return super.canGoBack() || mIsLive;
     }