diff options
| author | 2011-02-01 14:50:51 -0800 | |
|---|---|---|
| committer | 2011-02-01 14:50:51 -0800 | |
| commit | 22d197eb310d33c80361f57d39342260956c4987 (patch) | |
| tree | 0a607fd1cc97ecca3b8c4a8c7b33f76aac41aaa6 | |
| parent | 509e6cd89551d4222fab3dab9df190cc5e25666b (diff) | |
| parent | 068f3ef956ee3cadfe6089d9614ab093c03525c6 (diff) | |
am 068f3ef9: am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '068f3ef956ee3cadfe6089d9614ab093c03525c6':
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 2e9ecdfb48aa..60069f53c391 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -56,7 +56,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"); + } } /* |