commit ef070df1fdec048cf21a9a597c263364de2b5ee0
author Paul Lawrence <paullawrence@google.com> Wed Mar 09 13:45:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 09 13:45:15 2016 +0000
tree bfc228622411ee53f4b5b66b023374e2095b58d3
parent 19cdf2c9ee7dc30373c469daedb0707975a4d22a
parent 9be1ca39036f5d73c6cba344d1c1703383562512

Add API to IMountService to get encryption state
am: 9be1ca3903

* commit '9be1ca39036f5d73c6cba344d1c1703383562512':
  Add API to IMountService to get encryption state

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 c0137ba..e4064b3 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -265,7 +265,7 @@
      */
     /* package */ static synchronized MmsSmsDatabaseHelper getInstanceForCe(Context context) {
         if (sCeInstance == null) {
-            if (StorageManager.isFileBasedEncryptionEnabled()) {
+            if (StorageManager.isFileEncryptedNativeOrEmulated()) {
                 sCeInstance = new MmsSmsDatabaseHelper(
                     ProviderUtil.getCredentialEncryptedContext(context));
             } else {