commit a97d40f03ef4e84452f25b555e385faabcf45b15
author Jeff Sharkey <jsharkey@android.com> Thu Mar 17 22:18:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 17 22:18:51 2016 +0000
tree 02d2614f6eeeb7b5cd8cb234a844ac333ebe7285
parent a55471ad380642928c97fe939b914f9cd3976f72
parent 9d086109a949cce0cd8db4673bda931624f893e0

Follow framework refactoring. am: 6364dc8
am: 9d08610

* commit '9d086109a949cce0cd8db4673bda931624f893e0':
  Follow framework refactoring.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98db708..7829fee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,7 +59,7 @@
                   android:authorities="call_log_shadow"
                   android:syncable="false" android:multiprocess="false"
                   android:exported="true"
-                  android:encryptionAware="true"
+                  android:directBootAware="true"
                   android:readPermission="android.permission.MANAGE_USERS"
                   android:writePermission="android.permission.MANAGE_USERS">
         </provider>

src/com/android/providers/contacts/CallLogDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/CallLogDatabaseHelper.java b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
index 2c03a79..58f7047 100644
--- a/src/com/android/providers/contacts/CallLogDatabaseHelper.java
+++ b/src/com/android/providers/contacts/CallLogDatabaseHelper.java
@@ -196,7 +196,7 @@
         if (sInstanceForShadow == null) {
             // Shadow provider is always encryption-aware.
             sInstanceForShadow = new CallLogDatabaseHelper(
-                    context.createDeviceEncryptedStorageContext(), SHADOW_DATABASE_NAME);
+                    context.createDeviceProtectedStorageContext(), SHADOW_DATABASE_NAME);
         }
         return sInstanceForShadow;
     }