1 files changed, 18 insertions, 5 deletions
diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java
index cc7befc90..352c4eba9 100644
--- a/java/com/android/dialer/binary/common/DialerApplication.java
+++ b/java/com/android/dialer/binary/common/DialerApplication.java
@@ -17,12 +17,15 @@
 package com.android.dialer.binary.common;
 
 import android.app.Application;
+import android.os.StrictMode;
 import android.os.Trace;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import com.android.dialer.blocking.BlockedNumbersAutoMigrator;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
+import com.android.dialer.buildtype.BuildType;
+import com.android.dialer.common.concurrent.DefaultDialerExecutorFactory;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.persistentlog.PersistentLogger;
 
 /** A common application subclass for all Dialer build variants. */
 public abstract class DialerApplication extends Application implements HasRootComponent {
@@ -32,15 +35,25 @@ public abstract class DialerApplication extends Application implements HasRootCo
   @Override
   public void onCreate() {
     Trace.beginSection("DialerApplication.onCreate");
+    if (BuildType.get() == BuildType.BUGFOOD) {
+      enableStrictMode();
+    }
     super.onCreate();
     new BlockedNumbersAutoMigrator(
-            this,
-            PreferenceManager.getDefaultSharedPreferences(this),
-            new FilteredNumberAsyncQueryHandler(this))
-        .autoMigrate();
+            this.getApplicationContext(),
+            new FilteredNumberAsyncQueryHandler(this),
+            new DefaultDialerExecutorFactory())
+        .asyncAutoMigrate();
+    PersistentLogger.initialize(this);
     Trace.endSection();
   }
 
+  private void enableStrictMode() {
+    StrictMode.setThreadPolicy(
+        new StrictMode.ThreadPolicy.Builder().detectAll().penaltyDeath().build());
+    StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyDeath().build());
+  }
+
   /**
    * Returns a new instance of the root component for the application. Sub classes should define a
    * root component that extends all the sub components "HasComponent" intefaces. The component