commit d051757d4975d105d2dc7c454c2231230720ad3f
author Wenyi Wang <wenyiw@google.com> Thu Jul 27 22:38:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 27 22:38:52 2017 +0000
tree f0ad7aa24d374ed440456401cd9b9bfd00eec78d
parent b2d11b917275b212b7ba5c999bd5e9bf8ee25f97
parent 0e6c80e1400186f39b4e1c20cf036e4b096b9bb7

Merge "Stop using deprecated methods." 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 60de982..1e41af0 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -189,9 +189,9 @@
 
     private Notification getCompletedNotification() {
         final Intent intent = new Intent(this, PeopleActivity.class);
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(
+                this, ContactsNotificationChannelsUtil.DEFAULT_CHANNEL);
         builder.setOngoing(false)
-                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)
                 .setContentTitle(this.getString(R.string.importing_sim_finished_title))
                 .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
@@ -202,9 +202,9 @@
 
     private Notification getFailedNotification() {
         final Intent intent = new Intent(this, PeopleActivity.class);
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(
+                this, ContactsNotificationChannelsUtil.DEFAULT_CHANNEL);
         builder.setOngoing(false)
-                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)
                 .setContentTitle(this.getString(R.string.importing_sim_failed_title))
                 .setContentText(this.getString(R.string.importing_sim_failed_message))
@@ -215,10 +215,10 @@
     }
 
     private Notification getImportingNotification() {
-        final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+        final NotificationCompat.Builder builder = new NotificationCompat.Builder(
+                this, ContactsNotificationChannelsUtil.DEFAULT_CHANNEL);
         final String description = getString(R.string.importing_sim_in_progress_title);
         builder.setOngoing(true)
-                .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setProgress(/* current */ 0, /* max */ 100, /* indeterminate */ true)
                 .setContentTitle(description)
                 .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))