Move the functionality of DialerUtils#getDefaultSharedPreferenceForDeviceProtectedStorageContext(Context) to StorageComponent.

Bug: 30224215
Test: none
PiperOrigin-RevId: 173612463
Change-Id: Ia89d5d85c31ea2114b196393ae43b803023fc9bf

2 files changed, 5 insertions, 24 deletions

diff --git a/java/com/android/dialer/util/DialerUtils.java b/java/com/android/dialer/util/DialerUtils.java
index f38c650d3..7f7b9da74 100644
--- a/java/com/android/dialer/util/DialerUtils.java
+++ b/java/com/android/dialer/util/DialerUtils.java
@@ -21,14 +21,10 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Point;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.text.BidiFormatter;
@@ -36,9 +32,7 @@ import android.text.TextDirectionHeuristics;
 import android.view.View;
 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;
@@ -223,20 +217,4 @@ public class DialerUtils {
     }
     return new File(parentDir, String.valueOf(fileId));
   }
-
-  /**
-   * Returns default preference for context accessing device protected storage. This is used when
-   * directBoot is enabled (before device unlocked after boot) since the default shared preference
-   * used normally is not available at this moment for N devices. Returns regular default shared
-   * preference for pre-N devices.
-   */
-  @NonNull
-  public static SharedPreferences getDefaultSharedPreferenceForDeviceProtectedStorageContext(
-      @NonNull Context context) {
-    Assert.isNotNull(context);
-    if (ContextCompat.isDeviceProtectedStorage(context)) {
-      return PreferenceManager.getDefaultSharedPreferences(context);
-    }
-    return StorageComponent.get(context.getApplicationContext()).deviceProtectedSharedPreferences();
-  }
 }
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java
index 02ea91093..012b83ff1 100644
--- a/java/com/android/dialer/util/PermissionsUtil.java
+++ b/java/com/android/dialer/util/PermissionsUtil.java
@@ -40,6 +40,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.widget.Toast;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.storage.StorageComponent;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -221,7 +222,8 @@ public class PermissionsUtil {
    * @return true if we've already shown the camera privacy toast.
    */
   public static boolean hasCameraPrivacyToastShown(@NonNull Context context) {
-    return DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+    return StorageComponent.get(context)
+        .unencryptedSharedPrefs()
         .getBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, false);
   }
 
@@ -232,7 +234,8 @@ public class PermissionsUtil {
   }
 
   public static void setCameraPrivacyToastShown(@NonNull Context context) {
-    DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(context)
+    StorageComponent.get(context)
+        .unencryptedSharedPrefs()
         .edit()
         .putBoolean(PREFERENCE_CAMERA_ALLOWED_BY_USER, true)
         .apply();