diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-04-27 11:06:43 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-04-27 11:06:43 -0700 |
commit | 34483a0f6e1db9b0d96abc8b6dd056ec385f82b6 (patch) | |
tree | 7e5c09ceaa3cc6960377d9ef01b4a05a1ca651b8 /core/java/android/content/pm/ApplicationInfo.java | |
parent | 55fb51aa411b574646cc3068ce36e73789b81616 (diff) | |
parent | 5a8f877cf87755e34deb84a888c8de3a342e8f13 (diff) | |
download | frameworks_base-34483a0f6e1db9b0d96abc8b6dd056ec385f82b6.zip frameworks_base-34483a0f6e1db9b0d96abc8b6dd056ec385f82b6.tar.gz frameworks_base-34483a0f6e1db9b0d96abc8b6dd056ec385f82b6.tar.bz2 |
resolved conflicts for merge of 5a8f877c to kraken
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
Diffstat (limited to 'core/java/android/content/pm/ApplicationInfo.java')
-rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 023f9c4..ac8ac2a 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -265,17 +265,22 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * Value for {@link #flags}: Set to true if the application has been * installed using the forward lock option. * - * {@hide} + * Value for {@link #flags}: Set to true if the application is + * currently installed on external/removable/unprotected storage. Such + * applications may not be available if their storage is not currently + * mounted. When the storage it is on is not available, it will look like + * the application has been uninstalled (its .apk is no longer available) + * but its persistent data is not removed. */ - public static final int FLAG_FORWARD_LOCK = 1<<19; + public static final int FLAG_EXTERNAL_STORAGE = 1<<19; /** - * Value for {@link #flags}: Set to true if the application is - * currently installed on the sdcard. + * Value for {@link #flags}: Set to true if the application has been + * installed using the forward lock option. * * {@hide} */ - public static final int FLAG_EXTERNAL_STORAGE = 1<<20; + public static final int FLAG_FORWARD_LOCK = 1<<20; /** * Value for {@link #flags}: Set to true if the application is |