Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev

am: 0ca47e2c55

* commit '0ca47e2c5506d286469f29c25e5d45a45623e20f':
  Don't show secure startup options and strings when file encrypted

src/com/android/settings/ChooseLockGeneric.java

@@ -34,6 +34,7 @@ import android.os.Bundle;
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.os.storage.StorageManager;
 import android.security.KeyStore;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -481,7 +482,13 @@ public class ChooseLockGeneric extends SettingsActivity {
         }
 
         private void updatePreferenceSummaryIfNeeded() {
-            if (LockPatternUtils.isDeviceEncrypted()) {
+            // On a default block encrypted device with accessibility, add a warning
+            // that your data is not credential encrypted
+            if (!StorageManager.isBlockEncrypted()) {
+                return;
+            }
+
+            if (StorageManager.isNonDefaultBlockEncrypted()) {
                 return;
             }
 

src/com/android/settings/SecuritySettings.java

@@ -36,6 +36,7 @@ import android.os.Bundle;
 import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.os.storage.StorageManager;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.security.KeyStore;
@@ -1054,7 +1055,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
             DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
             return UserManager.get(context).isAdminUser()
                     && UserManager.get(context).isPrimaryUser()
-                    && LockPatternUtils.isDeviceEncryptionEnabled()
+                    && StorageManager.isBlockEncrypted()
                     && !dpm.getDoNotAskCredentialsOnBoot();
         }