Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c94dad83 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 6e52b5d7: 2568467 System crash when installing corrupt APK 

Merge commit '6e52b5d7' into froyo-plus-aosp

* commit '6e52b5d7':
  2568467 System crash when installing corrupt APK
parents eab92d7b 6e52b5d7

core/java/android/content/pm/PackageParser.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

    }

services/java/com/android/server/PackageManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -4006,6 +4006,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)