Merge "Fix the notification issue after pSIM is auto enabled" into sc-dev

This commit is contained in:
Jiashen Wang
2021-02-18 07:12:31 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 0 deletions

View File

@@ -12194,6 +12194,8 @@
<!-- Strings for SIM push notifications --> <!-- Strings for SIM push notifications -->
<!-- Category name of the notifications related to SIM setup. [CHAR LIMIT=NONE] --> <!-- Category name of the notifications related to SIM setup. [CHAR LIMIT=NONE] -->
<string name="sim_setup_channel_id">Network activation</string> <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] --> <!-- 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> <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] --> <!-- The body text of post DSDS reboot notification. [CHAR LIMIT=NONE] -->

View File

@@ -88,6 +88,11 @@ public class SimActivationNotifier {
SIM_SETUP_CHANNEL_ID, SIM_SETUP_CHANNEL_ID,
mContext.getString(R.string.sim_setup_channel_id), mContext.getString(R.string.sim_setup_channel_id),
NotificationManager.IMPORTANCE_HIGH)); NotificationManager.IMPORTANCE_HIGH));
mNotificationManager.createNotificationChannel(
new NotificationChannel(
SWITCH_SLOT_CHANNEL_ID,
mContext.getString(R.string.sim_switch_channel_id),
NotificationManager.IMPORTANCE_HIGH));
} }
/** /**