commit 9be1ca39036f5d73c6cba344d1c1703383562512
author Paul Lawrence <paullawrence@google.com> Tue Mar 08 14:33:43 2016 -0800
committer Paul Lawrence <paullawrence@google.com> Tue Mar 08 14:33:43 2016 -0800
tree 1df310268c184ebde8205320dd248f682b76ce0c
parent 45d95f610bdecb7bc4ab7f3b4b5fb182f1c96413

Add API to IMountService to get encryption state

Bug: 18002358
Change-Id: I178766e871900a8650c61fda190c3ba7efb30f25

src/com/android/providers/telephony/MmsSmsDatabaseHelper.java

diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index 27ce3c3..7e6a4c9 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -262,7 +262,7 @@
      */
     /* package */ static synchronized MmsSmsDatabaseHelper getInstanceForCe(Context context) {
         if (sCeInstance == null) {
-            if (StorageManager.isFileBasedEncryptionEnabled()) {
+            if (StorageManager.isFileEncryptedNativeOrEmulated()) {
                 sCeInstance = new MmsSmsDatabaseHelper(
                     ProviderUtil.getCredentialEncryptedContext(context));
             } else {