commit 8b7620dee4a061bd987254709300e3face3f7b90
author fionaxu <fionaxu@google.com> Mon May 01 16:22:17 2017 -0700
committer Chen Xu <fionaxu@google.com> Tue May 02 22:07:16 2017 +0000
tree d9f2b45d54bbcbee25be84c177078b8d8ddd8a48
parent ed5b4af1c9793397223b1107d141b70c04325d6c

support locale change for notification channels

Bug: 37911731
Test: Manual test with different languages
Change-Id: I31d1c3c34afcde5811f6402da168df6b183c1fd6

src/com/android/phone/EmergencyCallbackModeService.java

diff --git a/src/com/android/phone/EmergencyCallbackModeService.java b/src/com/android/phone/EmergencyCallbackModeService.java
index b163b10..3219c69 100644
--- a/src/com/android/phone/EmergencyCallbackModeService.java
+++ b/src/com/android/phone/EmergencyCallbackModeService.java
@@ -24,8 +24,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.graphics.BitmapFactory;
 import android.os.AsyncResult;
 import android.os.Binder;
 import android.os.CountDownTimer;
@@ -37,10 +35,9 @@
 
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
-import com.android.internal.telephony.util.TelephonyNotificationBuilder;
+import com.android.internal.telephony.util.NotificationChannelController;
 
 /**
  * Application service that inserts/removes Emergency Callback Mode notification and
@@ -181,8 +178,7 @@
             }
             return;
         }
-        final Notification.Builder builder = new TelephonyNotificationBuilder(
-                getApplicationContext());
+        final Notification.Builder builder = new Notification.Builder(getApplicationContext());
         builder.setOngoing(true);
         builder.setPriority(Notification.PRIORITY_HIGH);
         builder.setSmallIcon(R.drawable.ic_emergency_callback_mode);
@@ -207,7 +203,7 @@
                      R.plurals.phone_in_ecm_notification_time, minutes).toString(), time);
         }
         builder.setContentText(text);
-        builder.setChannelId(TelephonyNotificationBuilder.CHANNEL_ID_ALERT);
+        builder.setChannelId(NotificationChannelController.CHANNEL_ID_ALERT);
 
         // Show notification
         mNotificationManager.notify(R.string.phone_in_ecm_notification_title, builder.build());