From 168d09c3ad4fdc93ab018f68b7f583be7acd2851 Mon Sep 17 00:00:00 2001 From: linyuh Date: Thu, 26 Oct 2017 17:04:30 -0700 Subject: Move the functionality of DialerUtils#getDefaultSharedPreferenceForDeviceProtectedStorageContext(Context) to StorageComponent. Bug: 30224215 Test: none PiperOrigin-RevId: 173612463 Change-Id: Ia89d5d85c31ea2114b196393ae43b803023fc9bf --- java/com/android/dialer/storage/StorageComponent.java | 6 +++++- java/com/android/dialer/storage/StorageModule.java | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'java/com/android/dialer/storage') diff --git a/java/com/android/dialer/storage/StorageComponent.java b/java/com/android/dialer/storage/StorageComponent.java index 51afea70b..067b99424 100644 --- a/java/com/android/dialer/storage/StorageComponent.java +++ b/java/com/android/dialer/storage/StorageComponent.java @@ -25,7 +25,11 @@ import dagger.Subcomponent; @Subcomponent public abstract class StorageComponent { - public abstract @DeviceProtected SharedPreferences deviceProtectedSharedPreferences(); + /** + * Returns unencrypted default shared preferences. This method should not be used for private + * data. + */ + public abstract SharedPreferences unencryptedSharedPrefs(); public static StorageComponent get(Context context) { return ((StorageComponent.HasComponent) diff --git a/java/com/android/dialer/storage/StorageModule.java b/java/com/android/dialer/storage/StorageModule.java index 8c97980c1..3ee72c8d8 100644 --- a/java/com/android/dialer/storage/StorageModule.java +++ b/java/com/android/dialer/storage/StorageModule.java @@ -30,9 +30,7 @@ public class StorageModule { @Provides @Singleton - @DeviceProtected - static SharedPreferences provideDeviceProtectedSharedPreferences( - @ApplicationContext Context appContext) { + 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. Context deviceProtectedContext = ContextCompat.createDeviceProtectedStorageContext(appContext); -- cgit v1.2.3