Skip to content

Commit ad13bd5

Browse files
committed
Treat UnsatisfiedLinkError as non-fatal
Bug: 11466297 (cherry picked from commit e92f19e) Change-Id: I449474078b9f465f1da26a27bf96f9c35d2bb2fc
1 parent 1f83509 commit ad13bd5

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

core/java/com/android/internal/os/ZygoteInit.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ private static void preloadClasses() {
291291
count++;
292292
} catch (ClassNotFoundException e) {
293293
Log.w(TAG, "Class not found for preloading: " + line);
294+
} catch (UnsatisfiedLinkError e) {
295+
Log.w(TAG, "Problem preloading " + line + ": " + e);
294296
} catch (Throwable t) {
295297
Log.e(TAG, "Error preloading " + line + ".", t);
296298
if (t instanceof Error) {

0 commit comments

Comments
 (0)