From f99104dadddb8d7587aaa607821d284e214eb997 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Mon, 14 Dec 2015 11:31:29 -0800 Subject: [PATCH] Assigned a unique value for PRIVATE_FLAG_EPHEMERAL Previously the value was conflicting with a private flag PARTIALLY_ENCRYPTION_AWARE, which has been added before. Change-Id: I661d8b5f59a39b18288eae47b7522f87b120c57b --- core/java/android/content/pm/ApplicationInfo.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index b499af597c70f..1eeace127a32f 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -485,13 +485,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { */ public static final int PRIVATE_FLAG_AUTOPLAY = 1 << 7; - /** - * Value for {@link #flags}: {@code true} if the application is blocked via restrictions - * and for most purposes is considered as not installed. - * {@hide} - */ - public static final int PRIVATE_FLAG_EPHEMERAL = 1<<8; - /** * When set, at least one component inside this application is encryption aware. * @@ -499,6 +492,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { */ public static final int PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE = 1 << 8; + /** + * Value for {@link #flags}: {@code true} if the application is blocked via restrictions + * and for most purposes is considered as not installed. + * {@hide} + */ + public static final int PRIVATE_FLAG_EPHEMERAL = 1 << 9; + /** * Private/hidden flags. See {@code PRIVATE_FLAG_...} constants. * {@hide}