diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2010-05-18 13:17:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-18 13:17:58 -0700 |
| commit | 3d802ef73bd8573f61b6b441990fbbd8e44e18e7 (patch) | |
| tree | dad3b0fb98a9ce893ca20414e21080408f957e0e /services/java/com/android/server | |
| parent | 54525412c211033cf4f0a65323c86a55633698b0 (diff) | |
| parent | aa4db173a2465d74ea35cc7f736f6b2a5b01f72c (diff) | |
| download | frameworks_base-3d802ef73bd8573f61b6b441990fbbd8e44e18e7.zip frameworks_base-3d802ef73bd8573f61b6b441990fbbd8e44e18e7.tar.gz frameworks_base-3d802ef73bd8573f61b6b441990fbbd8e44e18e7.tar.bz2 | |
am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken
* commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
Fix 2641875
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 4bb135e..599023c 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -5082,7 +5082,8 @@ class PackageManagerService extends IPackageManager.Stub { } } - private InstallArgs createInstallArgs(Uri packageURI, int flags, String pkgName) { + private InstallArgs createInstallArgs(Uri packageURI, int flags, + String pkgName) { if (installOnSd(flags)) { String cid = getNextCodePath(null, pkgName, "/" + SdInstallArgs.RES_FILE_NAME); return new SdInstallArgs(packageURI, cid); @@ -5342,6 +5343,7 @@ class PackageManagerService extends IPackageManager.Stub { SdInstallArgs(String cid) { super(null, null, PackageManager.INSTALL_EXTERNAL, null); this.cid = cid; + cachePath = PackageHelper.getSdDir(cid); } SdInstallArgs(Uri packageURI, String cid) { |