commit 60999fcb2ed251ec4e24eccf94b66e35b851b415
author Brian Carlstrom <bdc@google.com> Mon Nov 04 17:57:14 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 04 17:57:15 2013 +0000
tree d9968443e5e433ac0d6e1e22ea7aa51479ccddf3
parent 1262d0c864acd9b5cb87767e11de6bdf1cbf2f39
parent e92f19e58caa05f5f4086d12a6396116ce6182aa

Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev

core/java/com/android/internal/os/ZygoteInit.java

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 @@
                         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) {