Merge "Treat UnsatisfiedLinkError as non-fatal"

2013-11-04 18:06:36 +00:00
parent 1f8350935c ad13bd5c0d
commit 01ac953180
1 changed files with 2 additions and 0 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -291,6 +291,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) {