am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev

* commit 'c8b01295bc5dcfcd2d9559f366e175db086eae37': Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:54:21 -08:00
parent a20bfd96ba c8b01295bc
commit 5f4a89480a
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
@@ -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) {