summaryrefslogtreecommitdiffstats
path: root/android_webview/java/src/org
diff options
context:
space:
mode:
authormnaganov <mnaganov@chromium.org>2016-01-28 16:56:57 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-29 00:58:02 +0000
commitd881bd2507c934240decdcbf2a5002716fe5b308 (patch)
tree37e0308f0a931e69a9dd21f4c234e11244d1f686 /android_webview/java/src/org
parent024f2aa0f1ec971346818bd37ca20b5d431d321c (diff)
downloadchromium_src-d881bd2507c934240decdcbf2a5002716fe5b308.zip
chromium_src-d881bd2507c934240decdcbf2a5002716fe5b308.tar.gz
chromium_src-d881bd2507c934240decdcbf2a5002716fe5b308.tar.bz2
[Android WebView] Do not terminate WebView when second browser is started
Still detect the situation when the app is creating WebView from two processes sharing the same data dir, but do not throw a RuntimeError, only print a warning. BUG=558377,582146 Review URL: https://codereview.chromium.org/1641383002 Cr-Commit-Position: refs/heads/master@{#372231}
Diffstat (limited to 'android_webview/java/src/org')
-rw-r--r--android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
index e7a6389..4b3f4c7 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java
@@ -104,9 +104,8 @@ public abstract class AwBrowserProcess {
Log.w(TAG, "Failed to create lock file " + lockFile, e);
}
if (!success) {
- throw new RuntimeException(
- "Could not obtain an exclusive lock on the data dir. The app may have "
- + "another WebView opened in a separate process");
+ Log.w(TAG, "The app may have another WebView opened in a separate process. "
+ + "This is not recommended and may stop working in future versions.");
}
}
}