summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-01-16 14:25:14 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-01-16 14:25:14 -0800
commitbdacefba95dcd2680b17120d1721167f5c7990c3 (patch)
tree2721271104f0b1afbb2c088ffcfd57c3c6180ff7
parent9b120ead0b5a3783031f35b93890226fc45f8f30 (diff)
parent75e616e8203a540c860888ccff73ffaa87498c5e (diff)
Merge "Change FLAG_FORWARD_LOCK back to its original value to not break things." into honeycomb
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 17131d213f70..2d95781781d5 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -281,9 +281,11 @@ 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.
*
+ * NOTE: DO NOT CHANGE THIS VALUE! It is saved in packages.xml.
+ *
* {@hide}
*/
- public static final int FLAG_FORWARD_LOCK = 1<<30;
+ public static final int FLAG_FORWARD_LOCK = 1<<29;
/**
* Value for {@link #flags}: set to <code>true</code> if the application
@@ -296,7 +298,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
*
* {@hide}
*/
- public static final int FLAG_CANT_SAVE_STATE = 1<<29;
+ public static final int FLAG_CANT_SAVE_STATE = 1<<28;
/**
* Flags associated with the application. Any combination of