diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-08-29 18:52:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-29 18:52:14 -0700 |
| commit | 694121c4004e80deec71736481cfb03bd50e38f5 (patch) | |
| tree | 32dd259891b706f101e2757758b5786e4eafbd99 | |
| parent | c452a40eea5a8bc23b05201e70a9ca740ee9ceec (diff) | |
| parent | 317046a08784f0df75165ac1eaaf3d237704618e (diff) | |
| download | frameworks_base-694121c4004e80deec71736481cfb03bd50e38f5.zip frameworks_base-694121c4004e80deec71736481cfb03bd50e38f5.tar.gz frameworks_base-694121c4004e80deec71736481cfb03bd50e38f5.tar.bz2 | |
Merge "Fix an NPE in PackageManager when getting the AppInfo for an app" into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 3c5eed7..48a4b74 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -1818,7 +1818,7 @@ public class PackageManagerService extends IPackageManager.Stub { 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); |