diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2010-05-18 13:16:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-18 13:16:13 -0700 |
| commit | aa4db173a2465d74ea35cc7f736f6b2a5b01f72c (patch) | |
| tree | bfe0eea8ac30d0eb21b3dfd121b30a521d99a5d3 /services/java/com/android/server | |
| parent | 3aecdb9d7e92b1a91860600feefb5c0062b652cf (diff) | |
| parent | 9a212adcffbc4b32d51f512889b33ba584647aa9 (diff) | |
| download | frameworks_base-aa4db173a2465d74ea35cc7f736f6b2a5b01f72c.zip frameworks_base-aa4db173a2465d74ea35cc7f736f6b2a5b01f72c.tar.gz frameworks_base-aa4db173a2465d74ea35cc7f736f6b2a5b01f72c.tar.bz2 | |
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 '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
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 b646a24..df93215 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -5057,7 +5057,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); @@ -5317,6 +5318,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) { |