From bd392c53970f4c24908668a6b28248943b31b072 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 14 Jan 2011 10:34:56 -0800
Subject: [PATCH] Check for null in PackageSetting constructor

Should bring honeycomb into parity with gingerbread changes.

Change-Id: Ieb48a0e420d4c2981130f268aba9b24f4fe25b84
---
 .../java/com/android/server/PackageManagerService.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 18371662b72b9..1efc645cc7c44 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -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) {