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

Check for null in PackageSetting constructor

Browse Source 
Should bring honeycomb into parity with gingerbread changes.

Change-Id: Ieb48a0e420d4c2981130f268aba9b24f4fe25b84
This commit is contained in:
Kenny Root
2011-01-14 10:34:56 -08:00
parent 1e8d23f6b0
commit bd392c5397
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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