Merge "Treat UnsatisfiedLinkError as non-fatal"
This commit is contained in:
@@ -291,6 +291,8 @@ public class ZygoteInit {
|
|||||||
count++;
|
count++;
|
||||||
} catch (ClassNotFoundException e) {
|
} catch (ClassNotFoundException e) {
|
||||||
Log.w(TAG, "Class not found for preloading: " + line);
|
Log.w(TAG, "Class not found for preloading: " + line);
|
||||||
|
} catch (UnsatisfiedLinkError e) {
|
||||||
|
Log.w(TAG, "Problem preloading " + line + ": " + e);
|
||||||
} catch (Throwable t) {
|
} catch (Throwable t) {
|
||||||
Log.e(TAG, "Error preloading " + line + ".", t);
|
Log.e(TAG, "Error preloading " + line + ".", t);
|
||||||
if (t instanceof Error) {
|
if (t instanceof Error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user