diff options
| author | zachh <zachh@google.com> | 2017-10-31 12:35:00 -0700 |
|---|---|---|
| committer | zachh <zachh@google.com> | 2017-11-01 22:00:54 +0000 |
| commit | 73bc4703739639d823abb743515836d4f55799c1 (patch) | |
| tree | f9f58f18d4e83c64c11447ec617ee3201b308cfc /java/com/android/dialer/storage | |
| parent | 0cd36a6e3bfda1c8b78c0375225929f50ee408a5 (diff) | |
Use unencrypted storage for shared prefs in new call log.
We need to be able to write the shared prefs when the device is in direct boot mode, and this data is not sensitive so can be unencrypted.
Bug: 68350256
Test: existing unit, manual
PiperOrigin-RevId: 174075154
Change-Id: Ib52e11c6abba0812d1dc07c642691359089c3e6e
Diffstat (limited to 'java/com/android/dialer/storage')
| -rw-r--r-- | java/com/android/dialer/storage/StorageComponent.java | 4 | ||||
| -rw-r--r-- | java/com/android/dialer/storage/StorageModule.java | 1 | ||||
| -rw-r--r-- | java/com/android/dialer/storage/Unencrypted.java (renamed from java/com/android/dialer/storage/DeviceProtected.java) | 4 |
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 {} |