diff options
| author | 2011-02-01 14:48:21 -0800 | |
|---|---|---|
| committer | 2011-02-01 14:48:21 -0800 | |
| commit | 068f3ef956ee3cadfe6089d9614ab093c03525c6 (patch) | |
| tree | 3cf49147e20f8a1d6a3d272813f3df6c1f99c1dd | |
| parent | 1c531f4a44c9ea61e74dbe2ded1b8dca0f83f790 (diff) | |
| parent | 066e1e3cc6a0a3f2fbf672b82f8e3317574b86da (diff) | |
am 066e1e3c: am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '066e1e3cc6a0a3f2fbf672b82f8e3317574b86da':
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 6536e457e0f0..6b5a5dc3e580 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"); + } } /* |