diff options
| author | John Reck <jreck@google.com> | 2011-07-20 15:01:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-20 15:01:26 -0700 |
| commit | 9a20064c22dcafeaa7a3ab0d536678783a3f3b51 (patch) | |
| tree | 82b5cf3e8bb850f423f8d9aa3dd73290ebc83493 | |
| parent | 45ec8e269b6942d1d9f55f888701248c86084c1c (diff) | |
| parent | 125ac59399fc3af180a0a9cef7100aa5d0ec306e (diff) | |
| download | packages_apps_Browser-9a20064c22dcafeaa7a3ab0d536678783a3f3b51.zip packages_apps_Browser-9a20064c22dcafeaa7a3ab0d536678783a3f3b51.tar.gz packages_apps_Browser-9a20064c22dcafeaa7a3ab0d536678783a3f3b51.tar.bz2 | |
Merge "Remove prompt-bypass"
| -rw-r--r-- | src/com/android/browser/BrowserWebView.java | 9 | ||||
| -rw-r--r-- | src/com/android/browser/CrashRecoveryHandler.java | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/com/android/browser/BrowserWebView.java b/src/com/android/browser/BrowserWebView.java index 8ea1123..38bbf90 100644 --- a/src/com/android/browser/BrowserWebView.java +++ b/src/com/android/browser/BrowserWebView.java @@ -99,13 +99,4 @@ public class BrowserWebView extends WebView { } } - @Override - protected void updateCachedTextfield(String updatedText) { - super.updateCachedTextfield(updatedText); - CrashRecoveryHandler handler = CrashRecoveryHandler.getInstance(); - if (handler != null) { - handler.backupState(); - } - } - } diff --git a/src/com/android/browser/CrashRecoveryHandler.java b/src/com/android/browser/CrashRecoveryHandler.java index 55fa6f8..8d7f243 100644 --- a/src/com/android/browser/CrashRecoveryHandler.java +++ b/src/com/android/browser/CrashRecoveryHandler.java @@ -170,8 +170,6 @@ public class CrashRecoveryHandler { } private boolean shouldPrompt() { - // STOPSHIP TODO: Remove once b/4971724 is fixed - if (true) return false; Context context = mController.getActivity(); SharedPreferences prefs = context.getSharedPreferences( RECOVERY_PREFERENCES, Context.MODE_PRIVATE); |