commit 32feebd05dc90785194df32b7a14c2e0ceba2b1e
author John Reck <jreck@google.com> Mon Jun 27 09:34:10 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 27 09:34:10 2011 -0700
tree 46502f071aa9f3f5b5bd64d2cbacb3954dceca09
parent 46473c5f8f772d3cb869d712c596308ba10722d3
parent cfeae6d3dc6f62f2d475bf50c0fc26a0e9c730de

Merge "Attempt to automatically restore after crash"

src/com/android/browser/CrashRecoveryHandler.java

diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java
index 6d8d921..5140952 100644
--- a/src/com/android/browser/CrashRecoveryHandler.java
+++ b/src/com/android/browser/CrashRecoveryHandler.java
@@ -22,6 +22,7 @@
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -38,8 +39,16 @@
 
     private static final String LOGTAG = "BrowserCrashRecovery";
     private static final String STATE_FILE = "browser_state.parcel";
+    private static final String RECOVERY_PREFERENCES = "browser_recovery_prefs";
+    private static final String KEY_LAST_RECOVERED = "last_recovered";
     private static final int BUFFER_SIZE = 4096;
     private static final long BACKUP_DELAY = 500; // 500ms between writes
+    /* This is the duration for which we will prompt to restore
+     * instead of automatically restoring. The first time the browser crashes,
+     * we will automatically restore. If we then crash again within XX minutes,
+     * we will prompt instead of automatically restoring.
+     */
+    private static final long PROMPT_INTERVAL = 30 * 60 * 1000; // 30 minutes
 
     private static CrashRecoveryHandler sInstance;
 
@@ -136,6 +145,7 @@
                 .setPositiveButton(R.string.recover_yes, new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        updateLastRecovered();
                         mController.doStart(state, intent);
                     }
                 })
@@ -155,7 +165,30 @@
                 .show();
     }
 
+    private boolean shouldPrompt() {
+        Context context = mController.getActivity();
+        SharedPreferences prefs = context.getSharedPreferences(
+                RECOVERY_PREFERENCES, Context.MODE_PRIVATE);
+        long lastRecovered = prefs.getLong(KEY_LAST_RECOVERED,
+                System.currentTimeMillis());
+        long timeSinceLastRecover = System.currentTimeMillis() - lastRecovered;
+        if (timeSinceLastRecover > PROMPT_INTERVAL) {
+            return false;
+        }
+        return true;
+    }
+
+    private void updateLastRecovered() {
+        Context context = mController.getActivity();
+        SharedPreferences prefs = context.getSharedPreferences(
+                RECOVERY_PREFERENCES, Context.MODE_PRIVATE);
+        prefs.edit()
+            .putLong(KEY_LAST_RECOVERED, System.currentTimeMillis())
+            .commit();
+    }
+
     public void startRecovery(Intent intent) {
+        Bundle state = null;
         Parcel parcel = Parcel.obtain();
         try {
             Context context = mController.getActivity();
@@ -169,16 +202,22 @@
             byte[] data = dataStream.toByteArray();
             parcel.unmarshall(data, 0, data.length);
             parcel.setDataPosition(0);
-            Bundle state = parcel.readBundle();
-            promptToRecover(state, intent);
+            state = parcel.readBundle();
+            if (shouldPrompt()) {
+                promptToRecover(state, intent);
+                return;
+            } else {
+                updateLastRecovered();
+            }
         } catch (FileNotFoundException e) {
             // No state to recover
-            mController.doStart(null, intent);
+            state = null;
         } catch (Exception e) {
             Log.w(LOGTAG, "Failed to recover state!", e);
-            mController.doStart(null, intent);
+            state = null;
         } finally {
             parcel.recycle();
         }
+        mController.doStart(state, intent);
     }
 }