diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-11-04 17:57:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-04 17:57:15 +0000 |
| commit | 60999fcb2ed251ec4e24eccf94b66e35b851b415 (patch) | |
| tree | d9968443e5e433ac0d6e1e22ea7aa51479ccddf3 /core/java/com | |
| parent | 1262d0c864acd9b5cb87767e11de6bdf1cbf2f39 (diff) | |
| parent | e92f19e58caa05f5f4086d12a6396116ce6182aa (diff) | |
| download | frameworks_base-60999fcb2ed251ec4e24eccf94b66e35b851b415.zip frameworks_base-60999fcb2ed251ec4e24eccf94b66e35b851b415.tar.gz frameworks_base-60999fcb2ed251ec4e24eccf94b66e35b851b415.tar.bz2 | |
Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
Diffstat (limited to 'core/java/com')
| -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 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 @@ 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) { |