diff options
| author | Kenny Root <kroot@google.com> | 2011-08-03 15:09:44 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-08-03 16:03:42 -0700 |
| commit | 1ebd74acf9977daa42133507e970dab88e08f0ef (patch) | |
| tree | c95bde1090f19e78201f15b54866ada88ab7cbf2 /services | |
| parent | 62c7b37590b1a692384a55949d3b9eba221a3652 (diff) | |
| download | frameworks_base-1ebd74acf9977daa42133507e970dab88e08f0ef.zip frameworks_base-1ebd74acf9977daa42133507e970dab88e08f0ef.tar.gz frameworks_base-1ebd74acf9977daa42133507e970dab88e08f0ef.tar.bz2 | |
Better error codes for missing files
Make sure that files that don't exist aren't returning bogus 'out of
space' error codes.
Add some Javadoc so I can remember what each thing does in an IDE.
Add copyright header to NativeLibraryHelper
Bug: 3375299
Change-Id: Iac46019160921daca65b21d38897e5165063316e
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 3d977d0..36371a5 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -5025,16 +5025,18 @@ public class PackageManagerService extends IPackageManager.Stub { } int loc = pkgLite.recommendedInstallLocation; - if (loc == PackageHelper.RECOMMEND_FAILED_INVALID_LOCATION){ + if (loc == PackageHelper.RECOMMEND_FAILED_INVALID_LOCATION) { ret = PackageManager.INSTALL_FAILED_INVALID_INSTALL_LOCATION; - } else if (loc == PackageHelper.RECOMMEND_FAILED_ALREADY_EXISTS){ + } else if (loc == PackageHelper.RECOMMEND_FAILED_ALREADY_EXISTS) { ret = PackageManager.INSTALL_FAILED_ALREADY_EXISTS; - } else if (loc == PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE){ + } else if (loc == PackageHelper.RECOMMEND_FAILED_INSUFFICIENT_STORAGE) { ret = PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE; } else if (loc == PackageHelper.RECOMMEND_FAILED_INVALID_APK) { ret = PackageManager.INSTALL_FAILED_INVALID_APK; + } else if (loc == PackageHelper.RECOMMEND_FAILED_INVALID_URI) { + ret = PackageManager.INSTALL_FAILED_INVALID_URI; } else if (loc == PackageHelper.RECOMMEND_MEDIA_UNAVAILABLE) { - ret = PackageManager.INSTALL_FAILED_MEDIA_UNAVAILABLE; + ret = PackageManager.INSTALL_FAILED_MEDIA_UNAVAILABLE; } else { // Override with defaults if needed. loc = installLocationPolicy(pkgLite, flags); |