summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-05 18:52:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-05 18:52:39 -0700
commit5a0797a91016e85bb50a7d5c0d7e031166429ddd (patch)
tree22aa755257f4fcfedb7177e8ee258686bba72fa1 /core/java/android/content
parentf0adaa1bd579a0749406f6f5c72d00a0a62eb0e6 (diff)
parentc94dad83be792928206363cb43524a68b6a62ffe (diff)
downloadframeworks_base-5a0797a91016e85bb50a7d5c0d7e031166429ddd.zip
frameworks_base-5a0797a91016e85bb50a7d5c0d7e031166429ddd.tar.gz
frameworks_base-5a0797a91016e85bb50a7d5c0d7e031166429ddd.tar.bz2
am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken * commit 'c94dad83be792928206363cb43524a68b6a62ffe': 2568467 System crash when installing corrupt APK
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/pm/PackageParser.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 050a81b..f9e12ce 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -343,6 +343,9 @@ public class PackageParser {
} catch (IOException e) {
Log.w(TAG, "Exception reading " + je.getName() + " in "
+ jarFile.getName(), e);
+ } catch (RuntimeException e) {
+ Log.w(TAG, "Exception reading " + je.getName() + " in "
+ + jarFile.getName(), e);
}
return null;
}