diff options
| author | 2011-02-01 13:02:19 -0800 | |
|---|---|---|
| committer | 2011-02-01 13:02:19 -0800 | |
| commit | dbf09feee0ba7210dadebbbb4cf7e7248f4ea634 (patch) | |
| tree | 17996bd630b5f1e7a40604fa297d4c020563c75a | |
| parent | a6fb375cf727b6ded057110875fe49a9b3f230a3 (diff) | |
| parent | eb17d6f51a9776f02be84859b8980a6317abd27c (diff) | |
am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit 'eb17d6f51a9776f02be84859b8980a6317abd27c':
Don't crash zygote if webcore fails to load
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index f54b20704e77..e36602f4b4a2 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -58,7 +58,11 @@ final class WebViewCore { // Load libwebcore during static initialization. This happens in the // zygote process so it will be shared read-only across all app // processes. - System.loadLibrary("webcore"); + try { + System.loadLibrary("webcore"); + } catch (UnsatisfiedLinkError e) { + Log.e(LOGTAG, "Unable to load webcore library"); + } } /* |