commit 2868b8dffeaf0d3e0f00051e482236bf727680a4
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Dec 03 17:22:50 2014 -0800
committer WebTech Code Review <code-review@localhost> Mon Dec 08 11:08:22 2014 -0800
tree d46cc0b2019cf190913623596c1c8f3f1e903314
parent d6efa97be3bdecb0c0f19cedca1fe8356030a67c

Fixes to crash view

- Ensure that onPause of controller is called when the activity is
  paused.
- When a foreground tab crashes when the browser is paused we do not
  show the crash view.

Change-Id: Ide72f43c3d273b1c8d68856d1d01bbea00855b7c

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 62dff92..c149a0b 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -758,7 +758,7 @@
             mVoiceResult = null;
         }
         if (current != null && current.hasCrashed) {
-            current.showCrashView();
+            current.replaceCrashView(current.getWebView(), current.getViewContainer());
         }
     }
 

src/com/android/browser/EngineInitializer.java

diff --git a/src/com/android/browser/EngineInitializer.java b/src/com/android/browser/EngineInitializer.java
index 3f3608c..03a18f6 100644
--- a/src/com/android/browser/EngineInitializer.java
+++ b/src/com/android/browser/EngineInitializer.java
@@ -265,6 +265,7 @@
         mOnResumePending = false;
         if (mActivityReady) {
             Engine.pauseTracing(mActivity.getApplicationContext());
+            mActivity.handleOnPause();
         }
     }
 

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 4e68c11..789db54 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -340,6 +340,7 @@
             wrapper.addView(view);
             hasCrashed = false;
         }
+        mMainView.reload();
     }
 
     protected void showCrashView() {
@@ -357,7 +358,6 @@
                 @Override
                 public void onClick(View arg0) {
                     replaceCrashView(mMainView, mContainer);
-                    mMainView.reload();
                 }
             });
         }