summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-11-03 22:47:11 -0800
committerBrian Carlstrom <bdc@google.com>2013-11-03 22:47:11 -0800
commite92f19e58caa05f5f4086d12a6396116ce6182aa (patch)
treec3101519657858fbd8e6e4ad6450920eb9fc1b50 /core/java/com
parent8ac67e62818137c2c3b8a81b795432beb112e29c (diff)
downloadframeworks_base-e92f19e58caa05f5f4086d12a6396116ce6182aa.zip
frameworks_base-e92f19e58caa05f5f4086d12a6396116ce6182aa.tar.gz
frameworks_base-e92f19e58caa05f5f4086d12a6396116ce6182aa.tar.bz2
Treat UnsatisfiedLinkError as non-fatal
Bug: 11466297 Change-Id: I12be43564da37290b3ee52b1858e44f2229711d9
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 73d34c3..c44afae 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -301,6 +301,8 @@ public class ZygoteInit {
count++;
} catch (ClassNotFoundException e) {
Log.w(TAG, "Class not found for preloading: " + line);
+ } catch (UnsatisfiedLinkError e) {
+ Log.w(TAG, "Problem preloading " + line + ": " + e);
} catch (Throwable t) {
Log.e(TAG, "Error preloading " + line + ".", t);
if (t instanceof Error) {