commit 86903bb8e46e0a2e29f3cc8d1fe69cb484f41ae4
author Wenyi Wang <wenyiw@google.com> Fri Mar 24 23:38:35 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 24 23:38:35 2017 +0000
tree eb64a218515580b22b530a5d51efd96d9a0d3d25
parent 156fc9f68761dd3eeb6fb3d154fc35a201991ebb
parent 57a0e98eed836b72dd3dc3540b9cac029266ed7c

Merge "Add isLoggable checks to all verbose and debug log outputs (1/2)" into ub-contactsdialer-i-dev

src/com/android/contacts/SimImportService.java

diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java
index 4d4f551..60de982 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -153,6 +153,7 @@
 
     @Override
     public int onStartCommand(Intent intent, int flags, final int startId) {
+        ContactsNotificationChannelsUtil.createDefaultChannel(this);
         final ImportTask task = createTaskForIntent(intent, startId);
         if (task == null) {
             new StopTask(this, startId).executeOnExecutor(mExecutor);

src/com/android/contacts/vcard/NotificationImportExportListener.java

diff --git a/src/com/android/contacts/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java
index f4d682c..daac5cb 100644
--- a/src/com/android/contacts/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -220,6 +220,7 @@
                 .appendQueryParameter(CancelActivity.TYPE, String.valueOf(type)).build();
         intent.setData(uri);
 
+        ContactsNotificationChannelsUtil.createDefaultChannel(context);
         final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
         builder.setOngoing(true)
                 .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
@@ -247,6 +248,7 @@
      */
     /* package */ static Notification constructCancelNotification(
             Context context, String description) {
+        ContactsNotificationChannelsUtil.createDefaultChannel(context);
         return new NotificationCompat.Builder(context)
                 .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)
@@ -278,6 +280,7 @@
      */
     /* package */ static Notification constructFinishNotificationWithFlags(
             Context context, String title, String description, Intent intent, int flags) {
+        ContactsNotificationChannelsUtil.createDefaultChannel(context);
         return new NotificationCompat.Builder(context)
                 .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)
@@ -302,6 +305,7 @@
      */
     /* package */ static Notification constructImportFailureNotification(
             Context context, String reason) {
+        ContactsNotificationChannelsUtil.createDefaultChannel(context);
         return new NotificationCompat.Builder(context)
                 .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)