commit b77b7d1db2f699a32b046a94a10367f275f05fb1
author Paul Lawrence <paullawrence@google.com> Wed Mar 09 13:47:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 09 13:47:13 2016 +0000
tree efadbce25a18896d1b4f2b7cb2813a884386790c
parent 5f4f5ca879a4d598130d232ffeb1771f5e8474bc
parent ef070df1fdec048cf21a9a597c263364de2b5ee0

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

* commit 'ef070df1fdec048cf21a9a597c263364de2b5ee0':
  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 {