am bd392c53: Check for null in PackageSetting constructor

* commit 'bd392c53970f4c24908668a6b28248943b31b072':
  Check for null in PackageSetting constructor
This commit is contained in:
Kenny Root
2011-01-14 13:03:02 -08:00
committed by Android Git Automerger

View File

@@ -7489,7 +7489,9 @@ class PackageManagerService extends IPackageManager.Stub {
private Signature[] mSignatures;
PackageSignatures(PackageSignatures orig) {
mSignatures = orig.mSignatures.clone();
if (orig != null && orig.mSignatures != null) {
mSignatures = orig.mSignatures.clone();
}
}
PackageSignatures(Signature[] sigs) {
@@ -7830,7 +7832,10 @@ class PackageManagerService extends IPackageManager.Stub {
GrantedPermissions(GrantedPermissions base) {
pkgFlags = base.pkgFlags;
grantedPermissions = (HashSet<String>) base.grantedPermissions.clone();
gids = base.gids.clone();
if (base.gids != null) {
gids = base.gids.clone();
}
}
void setFlags(int pkgFlags) {