3 files changed, 7 insertions, 2 deletions
diff --git a/java/com/android/dialer/storage/StorageComponent.java b/java/com/android/dialer/storage/StorageComponent.java
index 067b99424..cb5c4a879 100644
--- a/java/com/android/dialer/storage/StorageComponent.java
+++ b/java/com/android/dialer/storage/StorageComponent.java
@@ -28,7 +28,11 @@ public abstract class StorageComponent {
   /**
    * Returns unencrypted default shared preferences. This method should not be used for private
    * data.
+   *
+   * <p>These shared prefs are available even when the device is in FBE mode and are generally the
+   * ones that should be used, because Dialer needs to function while in FBE mode.
    */
+  @Unencrypted
   public abstract SharedPreferences unencryptedSharedPrefs();
 
   public static StorageComponent get(Context context) {
diff --git a/java/com/android/dialer/storage/StorageModule.java b/java/com/android/dialer/storage/StorageModule.java
index 3ee72c8d8..e1c5b4b08 100644
--- a/java/com/android/dialer/storage/StorageModule.java
+++ b/java/com/android/dialer/storage/StorageModule.java
@@ -30,6 +30,7 @@ public class StorageModule {
 
   @Provides
   @Singleton
+  @Unencrypted
   static SharedPreferences provideUnencryptedSharedPrefs(@ApplicationContext Context appContext) {
     // #createDeviceProtectedStorageContext returns a new context each time, so we cache the shared
     // preferences object in order to avoid accessing disk for every operation.
diff --git a/java/com/android/dialer/storage/DeviceProtected.java b/java/com/android/dialer/storage/Unencrypted.java
index 862259a61..02c902145 100644
--- a/java/com/android/dialer/storage/DeviceProtected.java
+++ b/java/com/android/dialer/storage/Unencrypted.java
@@ -17,6 +17,6 @@ package com.android.dialer.storage;
 
 import javax.inject.Qualifier;
 
-/** Annotation for retrieving device protected storage objects. */
+/** Annotation for retrieving unencrypted storage objects. */
 @Qualifier
-public @interface DeviceProtected {}
+public @interface Unencrypted {}