diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-11-04 18:06:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-04 18:06:36 +0000 |
| commit | 01ac953180d2ec2a020e1fc82bba8218c0aa4555 (patch) | |
| tree | 74b99a8f8c601927e944f6b89a40d6f3015eca91 | |
| parent | 1f8350935caa6a44ef2608e34d4e3a91db4424a7 (diff) | |
| parent | ad13bd5c0d83dd87599dbca11b93cd1ea413006d (diff) | |
| download | frameworks_base-01ac953180d2ec2a020e1fc82bba8218c0aa4555.zip frameworks_base-01ac953180d2ec2a020e1fc82bba8218c0aa4555.tar.gz frameworks_base-01ac953180d2ec2a020e1fc82bba8218c0aa4555.tar.bz2 | |
Merge "Treat UnsatisfiedLinkError as non-fatal"
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 2 |
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 fb22df7..4c82ce8 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) { |