Update AOSP Dialer source from internal google3 repository at

cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217

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