commit e167bc6c26e0c4771bda0d3cd956d80746624218
author Raj Mamadgi <rmamadgi@sta.samsung.com> Wed May 03 01:22:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 01:22:01 2017 +0000
tree 9becd9eeaa07eb876dc881ffdea1050e0a203b09
parent f4668e21e202e36e70197e439b2e89b9e841f8fb
parent 603c17858d7b6333de7e3d385a5aafa0b933e2d6

Merge "Merge "Adding support for File based encyrption to CTS Verfier" into nougat-cts-dev am: 258850c47e" into nougat-mr1-cts-dev
am: 603c17858d

Change-Id: I7211e6b09a4da28091345c2bdc114cffb5dabe9f

apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index d1977d8..fe7d926 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -246,6 +246,8 @@
             new Feature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION_NFCF, false),
             new Feature(PackageManager.FEATURE_PICTURE_IN_PICTURE, false),
             new Feature(PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT, false),
+            // FEATURE_FILE_BASED_ENCRYPTION is hide
+            new Feature("android.software.file_based_encryption", false),
     };
 
     @Override