1 files changed, 20 insertions, 12 deletions
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index f5e915989cad..73d0ddc46fac 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -208,18 +208,6 @@ public class ContextWrapper extends Context {
     }
 
     @Override
-    public File getDeviceEncryptedFilesDir() {
-        return mBase.getDeviceEncryptedFilesDir();
-    }
-
-    /** {@hide} */
-    @SystemApi
-    @Override
-    public File getCredentialEncryptedFilesDir() {
-        return mBase.getCredentialEncryptedFilesDir();
-    }
-
-    @Override
     public File getNoBackupFilesDir() {
         return mBase.getNoBackupFilesDir();
     }
@@ -802,4 +790,24 @@ public class ContextWrapper extends Context {
     public DisplayAdjustments getDisplayAdjustments(int displayId) {
         return mBase.getDisplayAdjustments(displayId);
     }
+
+    @Override
+    public Context createDeviceEncryptedContext(Context context) {
+        return mBase.createDeviceEncryptedContext(context);
+    }
+
+    @Override
+    public Context createCredentialEncryptedContext(Context context) {
+        return mBase.createCredentialEncryptedContext(context);
+    }
+
+    @Override
+    public boolean isDeviceEncrypted() {
+        return mBase.isDeviceEncrypted();
+    }
+
+    @Override
+    public boolean isCredentialEncrypted() {
+        return mBase.isCredentialEncrypted();
+    }
 }