commit bccd80b874175e123865d23df20523edfce5b9a6
author The Android Automerger <android-build@google.com> Thu Mar 10 00:02:09 2016 -0800
committer The Android Automerger <android-build@google.com> Thu Mar 10 00:02:09 2016 -0800
tree 1df310268c184ebde8205320dd248f682b76ce0c
parent 9be1ca39036f5d73c6cba344d1c1703383562512
parent b6e7907e98aa36525d780f82fc208007ad8398c4

merge in nyc-release history after reset to nyc-dev

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 {