Merge "Skip checking satellite support for registerForSatelliteProvisionStateChanged" into main
diff --git a/flags/misc.aconfig b/flags/misc.aconfig
index 2d6992a..303c0ff 100644
--- a/flags/misc.aconfig
+++ b/flags/misc.aconfig
@@ -78,6 +78,15 @@
bug: "309896524"
}
+# OWNER=rambowang TARGET=24Q3
+flag {
+ name: "reset_mobile_network_settings"
+ is_exported: true
+ namespace: "telephony"
+ description: "Allows applications to launch Reset Mobile Network Settings page in Settings app."
+ bug:"271921464"
+}
+
# OWNER=sangyun TARGET=24Q3
flag {
name: "roaming_notification_for_single_data_network"
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index a5350e2..a23e505 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -7864,7 +7864,8 @@
return carrierRoamingNtnSignalStrength;
}
- private void updateLastNotifiedCarrierRoamingNtnSignalStrengthAndNotify(@Nullable Phone phone) {
+ protected void updateLastNotifiedCarrierRoamingNtnSignalStrengthAndNotify(
+ @Nullable Phone phone) {
if (!mFeatureFlags.carrierRoamingNbIotNtn()) return;
if (phone == null) {
return;
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteSessionController.java b/src/java/com/android/internal/telephony/satellite/SatelliteSessionController.java
index 3f181bf..d1d03a0 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteSessionController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteSessionController.java
@@ -1301,6 +1301,8 @@
startNbIotInactivityTimer();
evaluateStartingEsosInactivityTimer();
evaluateStartingP2pSmsInactivityTimer();
+ mSatelliteController.updateLastNotifiedCarrierRoamingNtnSignalStrengthAndNotify(
+ mSatelliteController.getSatellitePhone());
}
@Override