commit 001516aea295a40fe0174aa028d434fc4573031d
author Jeff Sharkey <jsharkey@android.com> Thu Mar 17 11:05:20 2016 -0600
committer Jeff Sharkey <jsharkey@android.com> Thu Mar 17 11:35:19 2016 -0600
tree a2326f147c11a03ee790e37c6b586846cbcb60e4
parent f85836f11f05beb8a724621f90bbe13caa6e3a7f

Follow framework refactoring.

Bug: 27531029
Change-Id: I21255335a776cdc7f47b09d110e8334803c414b7

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 289f739..36d5ef6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,8 +37,8 @@
                  android:label="@string/app_label"
                  android:icon="@mipmap/ic_launcher_phone"
                  android:usesCleartextTraffic="true"
-                 android:forceDeviceEncrypted="true"
-                 android:encryptionAware="true">
+                 android:defaultToDeviceProtectedStorage="true"
+                 android:directBootAware="true">
 
         <provider android:name="TelephonyProvider"
                   android:authorities="telephony"

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

diff --git a/src/com/android/providers/telephony/ProviderUtil.java b/src/com/android/providers/telephony/ProviderUtil.java
index 7053e9a..4234b06 100644
--- a/src/com/android/providers/telephony/ProviderUtil.java
+++ b/src/com/android/providers/telephony/ProviderUtil.java
@@ -113,16 +113,16 @@
     }
 
     public static Context getCredentialEncryptedContext(Context context) {
-        if (context.isCredentialEncryptedStorage()) {
+        if (context.isCredentialProtectedStorage()) {
             return context;
         }
-        return context.createCredentialEncryptedStorageContext();
+        return context.createCredentialProtectedStorageContext();
     }
 
     public static Context getDeviceEncryptedContext(Context context) {
-        if (context.isDeviceEncryptedStorage()) {
+        if (context.isDeviceProtectedStorage()) {
             return context;
         }
-        return context.createDeviceEncryptedStorageContext();
+        return context.createDeviceProtectedStorageContext();
     }
 }