summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2016-01-28 18:20:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-01-28 18:20:03 +0000
commitec498e8ebedbfbb614808ca1cd4455886fa80af1 (patch)
treeb7a9e003260f3df039f09a94ddd4af466485b13e /core
parenta4ff39903908f2da53d2b326193027ebf0fb1ba2 (diff)
parentb92b05bb4bcaa6f7869128e925d0331eee62e4da (diff)
Merge "Report FBE through a feature string."
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/PackageManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 476dc46a2118..aaa02bd9ce8e 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2017,6 +2017,11 @@ public abstract class PackageManager {
public static final String FEATURE_SECURELY_REMOVES_USERS
= "android.software.securely_removes_users";
+ /** {@hide} */
+ @SdkConstant(SdkConstantType.FEATURE)
+ public static final String FEATURE_FILE_BASED_ENCRYPTION
+ = "android.software.file_based_encryption";
+
/**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
* The device has a full implementation of the android.webkit.* APIs. Devices