PMS: check outInfo for null during delete

kruton · kruton · commit 92bc9b319690 · 2012-10-23T17:44:26.000-07:00
It appears that changing an application's signature during boot can pass
an outInfo of null to this function.

Bug: 7402550
Change-Id: I839fea6c8ee728a352c6b906f0fa6671c85f8694
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
@@ -8291,7 +8291,7 @@ private boolean deleteInstalledPackageLI(PackageSetting ps,
         removePackageDataLI(ps, outInfo, flags, writeSettings);
 
         // Delete application code and resources
-        if (deleteCodeAndResources) {
+        if (deleteCodeAndResources && (outInfo != null)) {
             outInfo.args = createInstallArgs(packageFlagsToInstallFlags(ps), ps.codePathString,
                     ps.resourcePathString, ps.nativeLibraryPathString);
         }

Original file line number	Diff line number	Diff line change
`@@ -8291,7 +8291,7 @@ private boolean deleteInstalledPackageLI(PackageSetting ps,`
`8291`	`8291`	`removePackageDataLI(ps, outInfo, flags, writeSettings);`
`8292`	`8292`
`8293`	`8293`	`// Delete application code and resources`
`8294`		`- if (deleteCodeAndResources) {`
	`8294`	`+ if (deleteCodeAndResources && (outInfo != null)) {`
`8295`	`8295`	`outInfo.args = createInstallArgs(packageFlagsToInstallFlags(ps), ps.codePathString,`
`8296`	`8296`	`ps.resourcePathString, ps.nativeLibraryPathString);`
`8297`	`8297`	`}`