summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeffrey Vander Stoep <jeffv@google.com> 2015-11-16 23:33:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-11-16 23:33:53 +0000
commitcb60f71c71ee0164ef32c997dd3c28ef6e3bae2d (patch)
treed0673997e003a9446fbcadfd709dff8c0fffcc38
parent4604b74603ea951c0f0d0fc2d9b6bd46ae54e245 (diff)
parent9edb7bf4c6f9c59d0c469798d5936019e8199043 (diff)
Merge "fix ApplicationInfo flag collision"
-rw-r--r--core/java/android/content/pm/ApplicationInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 52ec4ccfd8f3..eda4136b311c 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -484,7 +484,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
*
* {@hide}
*/
- public static final int PRIVATE_FLAG_AUTOPLAY = 1<<6;
+ public static final int PRIVATE_FLAG_AUTOPLAY = 1 << 7;
/**
* Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.