commit f668eda9f2bcd522b799a466dc516ea5673bc7e0
author Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> Thu Feb 15 15:02:57 2024 +0000
committer Nagendra Prasad Nagarle Basavaraju <nagendranb@google.com> Wed Mar 06 10:46:02 2024 +0000
tree 24c4ece0165447b472b7fa1ea0c453b8f8aef726
parent d1a97399eba724b51e5bd67641f3570d58a3c153

[Bootstrap Activation] Avoid Data Roaming On/Off Popup at bootstrap sim

Bug: 323469670
Test: atest TeleServiceTests
Test: Device test at b/323469670#comment8
Change-Id: If851ea2c511ed8df3c3432a462a24dc1fed6abbf

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 2ae39df..da6cf25 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -78,6 +78,7 @@
 import com.android.internal.telephony.imsphone.ImsPhone;
 import com.android.internal.telephony.imsphone.ImsPhoneCallTracker;
 import com.android.internal.telephony.satellite.SatelliteController;
+import com.android.internal.telephony.subscription.SubscriptionManagerService;
 import com.android.internal.telephony.uicc.UiccPort;
 import com.android.internal.telephony.uicc.UiccProfile;
 import com.android.internal.util.IndentingPrintWriter;
@@ -342,11 +343,23 @@
                     break;
 
                 case EVENT_DATA_ROAMING_DISCONNECTED:
-                    notificationMgr.showDataRoamingNotification(msg.arg1, false);
+                    if (SubscriptionManagerService.getInstance()
+                            .isEsimBootStrapProvisioningActiveForSubId(msg.arg1)) {
+                        Log.i(LOG_TAG,
+                                "skip notification/warnings during esim bootstrap activation");
+                    } else {
+                        notificationMgr.showDataRoamingNotification(msg.arg1, false);
+                    }
                     break;
 
                 case EVENT_DATA_ROAMING_CONNECTED:
-                    notificationMgr.showDataRoamingNotification(msg.arg1, true);
+                    if (SubscriptionManagerService.getInstance()
+                            .isEsimBootStrapProvisioningActiveForSubId(msg.arg1)) {
+                        Log.i(LOG_TAG,
+                                "skip notification/warnings during esim bootstrap activation");
+                    } else {
+                        notificationMgr.showDataRoamingNotification(msg.arg1, true);
+                    }
                     break;
 
                 case EVENT_DATA_ROAMING_OK: