summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-08-08 06:48:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-08 06:48:38 +0000
commit90b030bae8cc1f13da7948fef4aff1d171a2885a (patch)
tree7d092f27b3aa6cc0b66a1f0715f00d68f9e2b706 /core/java/android
parentfc81be947fcbb0d738a75eb2c6d560c52f7f9a99 (diff)
parent3e0be7440bf40f5d81581077bc4f5f47e57b88b7 (diff)
downloadframeworks_base-90b030bae8cc1f13da7948fef4aff1d171a2885a.zip
frameworks_base-90b030bae8cc1f13da7948fef4aff1d171a2885a.tar.gz
frameworks_base-90b030bae8cc1f13da7948fef4aff1d171a2885a.tar.bz2
Merge "Do not show removed permissions in the UI - framework" into mnc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PermissionInfo.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index d514513..9da2ba9 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -145,6 +145,13 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
public static final int FLAG_COSTS_MONEY = 1<<0;
/**
+ * Flag for {@link #flags}, corresponding to <code>hidden</code>
+ * value of {@link android.R.attr#permissionFlags}.
+ * @hide
+ */
+ public static final int FLAG_HIDDEN = 1<<1;
+
+ /**
* Flag for {@link #flags}, indicating that this permission has been
* installed into the system's globally defined permissions.
*/