From ad13bd5c0d83dd87599dbca11b93cd1ea413006d Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Sun, 3 Nov 2013 22:47:11 -0800
Subject: [PATCH] Treat UnsatisfiedLinkError as non-fatal

Bug: 11466297

(cherry picked from commit e92f19e58caa05f5f4086d12a6396116ce6182aa)

Change-Id: I449474078b9f465f1da26a27bf96f9c35d2bb2fc
---
 core/java/com/android/internal/os/ZygoteInit.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index fb22df7e4850f..4c82ce80a080e 100644
--- 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) {