Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK

Browse Source 
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken

* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
  2568467 System crash when installing corrupt APK
This commit is contained in:
Dianne Hackborn
2010-04-05 18:52:39 -07:00
committed by Android Git Automerger
parent f0adaa1bd5 c94dad83be
commit 5a0797a910
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/PackageParser.java
View File

@@ -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;
}

3
services/java/com/android/server/PackageManagerService.java
View File

@@ -4030,6 +4030,9 @@ class PackageManagerService extends IPackageManager.Stub {
if (bp.protectionLevel == PermissionInfo.PROTECTION_NORMAL
|| bp.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) {
allowed = true;
} else if (bp.packageSetting == null) {
// This permission is invalid; skip it.
allowed = false;
} else if (bp.protectionLevel == PermissionInfo.PROTECTION_SIGNATURE
|| bp.protectionLevel == PermissionInfo.PROTECTION_SIGNATURE_OR_SYSTEM) {
allowed = (checkSignaturesLP(bp.packageSetting.signatures.mSignatures, pkg.mSignatures)