Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 199fc3c..07386c1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12194,6 +12194,8 @@
<!-- Strings for SIM push notifications -->
<!-- Category name of the notifications related to SIM setup. [CHAR LIMIT=NONE] -->
<string name="sim_setup_channel_id">Network activation</string>
+ <!-- Title on a push notification indicating that the user's device is in the middle of switching between mobile networks. [CHAR LIMIT=NONE] -->
+ <string name="sim_switch_channel_id">Carrier switching</string>
<!-- The title of post DSDS reboot notification. The title includes carrier's name. [CHAR LIMIT=NONE] -->
<string name="post_dsds_reboot_notification_title_with_carrier"><xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> is active</string>
<!-- The body text of post DSDS reboot notification. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/sim/SimActivationNotifier.java b/src/com/android/settings/sim/SimActivationNotifier.java
index 735cb46..c90836e 100644
--- a/src/com/android/settings/sim/SimActivationNotifier.java
+++ b/src/com/android/settings/sim/SimActivationNotifier.java
@@ -88,6 +88,11 @@
SIM_SETUP_CHANNEL_ID,
mContext.getString(R.string.sim_setup_channel_id),
NotificationManager.IMPORTANCE_HIGH));
+ mNotificationManager.createNotificationChannel(
+ new NotificationChannel(
+ SWITCH_SLOT_CHANNEL_ID,
+ mContext.getString(R.string.sim_switch_channel_id),
+ NotificationManager.IMPORTANCE_HIGH));
}
/**