Decide whether to exclude roamingNoti based on the actual network
Changed to check MCC to exclude roaming notifications based on
actual camped network.
Bug: 322119164
Test: manually tested in TMO roaming network.
Change-Id: I91e34a95b7deb404281bdd02a8d3184d26e9b80c
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 7fba651..3e0a6e3 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -1173,7 +1173,8 @@
msg.arg1 = mDefaultDataSubId;
msg.sendToTarget();
} else if (dataAllowed && dataIsNowRoaming(mDefaultDataSubId)) {
- if (!shouldShowRoamingNotification(roamingOperatorNumeric)) {
+ if (!shouldShowRoamingNotification(roamingOperatorNumeric != null
+ ? roamingOperatorNumeric : phone.getServiceState().getOperatorNumeric())) {
Log.d(LOG_TAG, "Skip showing roaming connected notification.");
return;
}