Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev

Amith Yamasani · Android (Google) Code Review · commit 694121c4004e · 2012-08-29T18:52:14.000-07:00
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
@@ -1818,7 +1818,7 @@ private PackageInfo generatePackageInfoFromSettingsLPw(String packageName, int f
                 pkg.applicationInfo.publicSourceDir = ps.resourcePathString;
                 pkg.applicationInfo.sourceDir = ps.codePathString;
                 pkg.applicationInfo.dataDir =
-                        getDataPathForPackage(ps.pkg.packageName, 0).getPath();
+                        getDataPathForPackage(packageName, 0).getPath();
                 pkg.applicationInfo.nativeLibraryDir = ps.nativeLibraryPathString;
             }
             // pkg.mSetEnabled = ps.getEnabled(userId);

Original file line number	Diff line number	Diff line change
`@@ -1818,7 +1818,7 @@ private PackageInfo generatePackageInfoFromSettingsLPw(String packageName, int f`
`1818`	`1818`	`pkg.applicationInfo.publicSourceDir = ps.resourcePathString;`
`1819`	`1819`	`pkg.applicationInfo.sourceDir = ps.codePathString;`
`1820`	`1820`	`pkg.applicationInfo.dataDir =`
`1821`		`- getDataPathForPackage(ps.pkg.packageName, 0).getPath();`
	`1821`	`+ getDataPathForPackage(packageName, 0).getPath();`
`1822`	`1822`	`pkg.applicationInfo.nativeLibraryDir = ps.nativeLibraryPathString;`
`1823`	`1823`	`}`
`1824`	`1824`	`// pkg.mSetEnabled = ps.getEnabled(userId);`