diff options
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-08-12 12:01:35 -0700 |
|---|---|---|
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-08-12 12:01:35 -0700 |
| commit | 45e503ae91d380ebe5158927b7d6aa80e166d096 (patch) | |
| tree | 6c0b3411d101ad0d5b4518ebf4e313a7d7686dec /core/java | |
| parent | 4547962a95359f1d390b9cbb7459789391e86089 (diff) | |
| parent | 802527c6a8a91f7da72f2ce9f6cb3cc342582127 (diff) | |
| download | frameworks_base-45e503ae91d380ebe5158927b7d6aa80e166d096.zip frameworks_base-45e503ae91d380ebe5158927b7d6aa80e166d096.tar.gz frameworks_base-45e503ae91d380ebe5158927b7d6aa80e166d096.tar.bz2 | |
resolved conflicts for merge of 802527c6 to master skipping preloaded-classes as pre Bob
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 989286e..a2d3cd8 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -310,6 +310,15 @@ public class ZygoteInit { } else { missingClasses += " " + line; } + } catch (Throwable t) { + Log.e(TAG, "Error preloading " + line + ".", t); + if (t instanceof Error) { + throw (Error) t; + } + if (t instanceof RuntimeException) { + throw (RuntimeException) t; + } + throw new RuntimeException(t); } } |