summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-03-19 19:24:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-19 19:24:04 -0700
commit09f5aededa1568f59bbe014ce5199ebca35a93b8 (patch)
tree99ccbe34f133d94ff79a4a0f94b84d29ddd6a024 /core/java/android
parent975e04c24494cf4515a61f3bcf6b25fb5f565f4f (diff)
parentedc84ee8392afa0102f098168329db5bb43a6d4b (diff)
downloadframeworks_base-09f5aededa1568f59bbe014ce5199ebca35a93b8.zip
frameworks_base-09f5aededa1568f59bbe014ce5199ebca35a93b8.tar.gz
frameworks_base-09f5aededa1568f59bbe014ce5199ebca35a93b8.tar.bz2
Merge "Selective enforcement of READ_EXTERNAL_STORAGE."
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/IPackageManager.aidl3
-rw-r--r--core/java/android/content/pm/PackageManager.java5
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 95b6fee..9bd1940 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -370,4 +370,7 @@ interface IPackageManager {
boolean isFirstBoot();
List<UserInfo> getUsers();
+
+ void setPermissionEnforcement(String permission, int enforcement);
+ int getPermissionEnforcement(String permission);
}
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 544bd9c..55426b8 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1090,6 +1090,11 @@ public abstract class PackageManager {
public static final String EXTRA_VERIFICATION_INSTALL_FLAGS
= "android.content.pm.extra.VERIFICATION_INSTALL_FLAGS";
+ /** {@hide} */
+ public static final int ENFORCEMENT_DEFAULT = 0;
+ /** {@hide} */
+ public static final int ENFORCEMENT_YES = 1;
+
/**
* Retrieve overall information about an application package that is
* installed on the system.