From 55a921ec8458adb4d6139f65270400ff035c472e Mon Sep 17 00:00:00 2001 From: zachh Date: Fri, 11 Aug 2017 17:29:55 -0700 Subject: Warm up shared preferences in App#onCreate for bugfood builds. This is being moved from DialtactsActivity#onCreate in order to provide better coverage (since App#onCreate is called earlier). Additionally, to de-risk any impact on release builds, warming up now only happens when strict mode is enabled, i.e. on bugfood builds. Test: none PiperOrigin-RevId: 165046087 Change-Id: I2bd5337a59fa5a430480e77986015c61798185e8 --- java/com/android/dialer/app/DialtactsActivity.java | 30 ---------------------- 1 file changed, 30 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java index a5d650215..7e62065ee 100644 --- a/java/com/android/dialer/app/DialtactsActivity.java +++ b/java/com/android/dialer/app/DialtactsActivity.java @@ -31,7 +31,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; import android.os.Trace; -import android.preference.PreferenceManager; import android.provider.CallLog.Calls; import android.speech.RecognizerIntent; import android.support.annotation.MainThread; @@ -121,7 +120,6 @@ import com.android.dialer.simulator.Simulator; import com.android.dialer.simulator.SimulatorComponent; import com.android.dialer.smartdial.SmartDialNameMatcher; import com.android.dialer.smartdial.SmartDialPrefix; -import com.android.dialer.strictmode.DialerStrictMode; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.PermissionsUtil; @@ -389,8 +387,6 @@ public class DialtactsActivity extends TransactionSafeActivity Trace.beginSection(TAG + " onCreate"); super.onCreate(savedInstanceState); - warmupSharedPrefs(); - mFirstLaunch = true; isLastTabEnabled = ConfigProviderBindings.get(this).getBoolean("last_tab_enabled", false); @@ -507,32 +503,6 @@ public class DialtactsActivity extends TransactionSafeActivity Trace.endSection(); } - /** - * We frequently access shared preferences on the main thread, which causes strict mode - * violations. Warm up the shared preferences here so that later uses of shared preferences access - * the in-memory versions and we don't have to bypass strict mode at every point in the - * application where shared preferences are accessed. - */ - private void warmupSharedPrefs() { - DialerStrictMode.bypass( - () -> { - // From credential-encrypted (CE) storage, i.e.: - // /data/data/com.google.android.dialer/shared_prefs - - // com.google.android.dialer_preferences.xml - PreferenceManager.getDefaultSharedPreferences(this); - - // com.google.android.dialer.xml - getSharedPreferences(getPackageName(), Context.MODE_PRIVATE); - - // From device-encrypted (DE) storage, i.e.: - // /data/user_de/0/com.android.dialer/shared_prefs/ - - // com.google.android.dialer_preferences.xml - DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this); - }); - } - @NonNull private ActionBar getActionBarSafely() { return Assert.isNotNull(getSupportActionBar()); -- cgit v1.2.3