diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-05-11 15:47:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 15:47:01 -0700 |
| commit | cd5862586ab555b53ffd0a62488843838d1aa94d (patch) | |
| tree | e20dfc27fd057b29ded79b4cf70418228d581f81 /core/java | |
| parent | 2b5cebebb60c33fe864bed71778253837cbddb54 (diff) | |
| parent | f53857716a0db805c51c0cae93550d90e32e4749 (diff) | |
| download | frameworks_base-cd5862586ab555b53ffd0a62488843838d1aa94d.zip frameworks_base-cd5862586ab555b53ffd0a62488843838d1aa94d.tar.gz frameworks_base-cd5862586ab555b53ffd0a62488843838d1aa94d.tar.bz2 | |
Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a48924e..2baad62 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentSender; -import android.content.pm.ManifestDigest; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.graphics.drawable.Drawable; @@ -1090,10 +1089,6 @@ public abstract class PackageManager { public static final String EXTRA_VERIFICATION_INSTALL_FLAGS = "android.content.pm.extra.VERIFICATION_INSTALL_FLAGS"; - /** {@hide} */ - // TODO: enable this for userdebug and eng builds; see 6389556 - public static final boolean DEFAULT_ENFORCE_READ_EXTERNAL_STORAGE = false; - /** * Retrieve overall information about an application package that is * installed on the system. diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 497e66e8..ea3cab4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4253,6 +4253,10 @@ public final class Settings { /** Timeout for package verification. {@hide} */ public static final String PACKAGE_VERIFIER_TIMEOUT = "verifier_timeout"; + /** {@hide} */ + public static final String + READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT = "read_external_storage_enforced_default"; + /** * Duration in milliseconds before pre-authorized URIs for the contacts * provider should expire. |