diff options
author | Kenny Root <kroot@google.com> | 2010-08-02 13:31:41 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-02 13:31:41 -0700 |
commit | b0289f62af77a2811b4528fe284aad871e3c6b31 (patch) | |
tree | 32108a844de9f1ab7712e2be5ec51a3aa0c73e68 /packages/DefaultContainerService | |
parent | ae2036a8f9365cec0f343f2668424e8e964a971c (diff) | |
parent | 59d4a5369cd68d4b65809ded407611b62b013f9a (diff) | |
download | frameworks_base-b0289f62af77a2811b4528fe284aad871e3c6b31.zip frameworks_base-b0289f62af77a2811b4528fe284aad871e3c6b31.tar.gz frameworks_base-b0289f62af77a2811b4528fe284aad871e3c6b31.tar.bz2 |
am 59d4a536: am 739cdab7: Merge "Do not deference before null check" into gingerbread
Merge commit '59d4a5369cd68d4b65809ded407611b62b013f9a'
* commit '59d4a5369cd68d4b65809ded407611b62b013f9a':
Do not deference before null check
Diffstat (limited to 'packages/DefaultContainerService')
-rw-r--r-- | packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java index 6eaf0cc..f1c6532 100644 --- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java +++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java @@ -125,8 +125,6 @@ public class DefaultContainerService extends IntentService { metrics.setToDefaults(); PackageParser.PackageLite pkg = packageParser.parsePackageLite( archiveFilePath, 0); - ret.packageName = pkg.packageName; - ret.installLocation = pkg.installLocation; // Nuke the parser reference right away and force a gc packageParser = null; Runtime.getRuntime().gc(); @@ -136,6 +134,7 @@ public class DefaultContainerService extends IntentService { return ret; } ret.packageName = pkg.packageName; + ret.installLocation = pkg.installLocation; ret.recommendedInstallLocation = recommendAppInstallLocation(pkg.installLocation, archiveFilePath, flags); return ret; } |