Merge "Update Dialer source to latest internal Google revision."

1 files changed, 5 insertions, 9 deletions

diff --git a/java/com/android/dialer/util/DialerUtils.java b/java/com/android/dialer/util/DialerUtils.java
index 63f870e73..f38c650d3 100644
--- a/java/com/android/dialer/util/DialerUtils.java
+++ b/java/com/android/dialer/util/DialerUtils.java
@@ -38,6 +38,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.storage.StorageComponent;
 import com.android.dialer.telecom.TelecomUtil;
 import java.io.File;
 import java.util.Iterator;
@@ -233,14 +234,9 @@ public class DialerUtils {
   public static SharedPreferences getDefaultSharedPreferenceForDeviceProtectedStorageContext(
       @NonNull Context context) {
     Assert.isNotNull(context);
-    Context deviceProtectedContext =
-        ContextCompat.isDeviceProtectedStorage(context)
-            ? context
-            : ContextCompat.createDeviceProtectedStorageContext(context);
-    // ContextCompat.createDeviceProtectedStorageContext(context) returns null on pre-N, thus fall
-    // back to regular default shared preference for pre-N devices since devices protected context
-    // is not available.
-    return PreferenceManager.getDefaultSharedPreferences(
-        deviceProtectedContext != null ? deviceProtectedContext : context);
+    if (ContextCompat.isDeviceProtectedStorage(context)) {
+      return PreferenceManager.getDefaultSharedPreferences(context);
+    }
+    return StorageComponent.get(context.getApplicationContext()).deviceProtectedSharedPreferences();
   }
 }