diff options
| author | Suchi Amalapurapu <asuchitra@google.com> | 2010-02-04 22:51:07 -0800 |
|---|---|---|
| committer | Suchi Amalapurapu <asuchitra@google.com> | 2010-02-08 14:52:25 -0800 |
| commit | b56ae20b22fd7283df32072a431ab6d4965f3c1b (patch) | |
| tree | c26e5e7bf6433dfbe500917fc7001f77c331c4f2 /core/java/android/content/pm | |
| parent | 836a1f2cb99600c26a1a928a9e3240b9dec3079b (diff) | |
| download | frameworks_base-b56ae20b22fd7283df32072a431ab6d4965f3c1b.zip frameworks_base-b56ae20b22fd7283df32072a431ab6d4965f3c1b.tar.gz frameworks_base-b56ae20b22fd7283df32072a431ab6d4965f3c1b.tar.bz2 | |
Rename media resource broadcasts
Add checks for fwdlocked and updated system apps
add more tests
remove duplicate adds
Diffstat (limited to 'core/java/android/content/pm')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 9 | ||||
| -rw-r--r-- | core/java/android/content/pm/RegisteredServicesCache.java | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 745628a..e3b1694 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -437,6 +437,15 @@ public abstract class PackageManager { public static final int INSTALL_FAILED_CONTAINER_ERROR = -18; /** + * Installation return code: this is passed to the {@link IPackageInstallObserver} by + * {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)} if + * the new package couldn't be installed in the specified install + * location. + * @hide + */ + public static final int INSTALL_FAILED_INVALID_INSTALL_LOCATION = -19; + + /** * Installation parse return code: this is passed to the {@link IPackageInstallObserver} by * {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)} * if the parser was given a path that is not a file, or does not end with the expected diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java index 7362394..a885820 100644 --- a/core/java/android/content/pm/RegisteredServicesCache.java +++ b/core/java/android/content/pm/RegisteredServicesCache.java @@ -117,8 +117,8 @@ public abstract class RegisteredServicesCache<V> { mContext.registerReceiver(receiver, intentFilter); // Register for events related to sdcard installation. IntentFilter sdFilter = new IntentFilter(); - sdFilter.addAction(Intent.ACTION_MEDIA_RESOURCES_AVAILABLE); - sdFilter.addAction(Intent.ACTION_MEDIA_RESOURCES_UNAVAILABLE); + sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE); + sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE); mContext.registerReceiver(receiver, sdFilter); } |