From 15e7a0bce4c496582c13131bad89bf785a641714 Mon Sep 17 00:00:00 2001
From: Jiashen Wang <jiashenwang@google.com>
Date: Fri, 12 Feb 2021 16:09:03 -0800
Subject: [PATCH] Fix the notification issue after pSIM is auto enabled

Bug: 179933905
Test: Manually tested
Change-Id: I52a751c515785618c9a1a5f3bc571687731b4552
---
 res/values/strings.xml                                  | 2 ++
 src/com/android/settings/sim/SimActivationNotifier.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ac3a281f6a..764bd48e1f3 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 735cb463c3e..c90836e5b78 100644
--- a/src/com/android/settings/sim/SimActivationNotifier.java
+++ b/src/com/android/settings/sim/SimActivationNotifier.java
@@ -88,6 +88,11 @@ public class SimActivationNotifier {
                         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));
     }
 
     /**