Snap for 13264465 from 36664cac465be5eff4ad3968fba2565c4a99594d to 25Q2-release
Change-Id: I2d2ffedb127105eb47bb1ab7c041e167c268c6e5
diff --git a/proto/src/persist_atoms.proto b/proto/src/persist_atoms.proto
index c2385ae..d6dff87 100644
--- a/proto/src/persist_atoms.proto
+++ b/proto/src/persist_atoms.proto
@@ -441,6 +441,7 @@
optional bool is_iwlan_cross_sim = 15;
optional bool is_ntn = 16;
optional bool is_nb_iot_ntn = 17;
+ optional bool is_opportunistic = 18;
// Internal use only
optional int64 last_used_millis = 10001;
@@ -453,6 +454,7 @@
optional bool is_multi_sim = 4;
optional int32 carrier_id = 5;
optional int32 switch_count = 6;
+ optional bool is_opportunistic = 7;
// Internal use only
optional int64 last_used_millis = 10001;
diff --git a/src/java/com/android/internal/telephony/metrics/MetricsCollector.java b/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
index 31f4738..1bbfddb 100644
--- a/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
+++ b/src/java/com/android/internal/telephony/metrics/MetricsCollector.java
@@ -1064,7 +1064,8 @@
serviceSwitch.simSlotIndex,
serviceSwitch.isMultiSim,
serviceSwitch.carrierId,
- serviceSwitch.switchCount);
+ serviceSwitch.switchCount,
+ serviceSwitch.isOpportunistic);
}
private static StatsEvent buildStatsEvent(CellularServiceState state) {
@@ -1087,7 +1088,8 @@
state.isDataEnabled,
state.isIwlanCrossSim,
state.isNtn,
- state.isNbIotNtn);
+ state.isNbIotNtn,
+ state.isOpportunistic);
}
private static StatsEvent buildStatsEvent(VoiceCallRatUsage usage) {
diff --git a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
index 9408ffa..b353078 100644
--- a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
+++ b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
@@ -2013,7 +2013,8 @@
&& state.isDataEnabled == key.isDataEnabled
&& state.isIwlanCrossSim == key.isIwlanCrossSim
&& state.isNtn == key.isNtn
- && state.isNbIotNtn == key.isNbIotNtn) {
+ && state.isNbIotNtn == key.isNbIotNtn
+ && state.isOpportunistic == key.isOpportunistic) {
return state;
}
}
@@ -2030,7 +2031,8 @@
&& serviceSwitch.ratTo == key.ratTo
&& serviceSwitch.simSlotIndex == key.simSlotIndex
&& serviceSwitch.isMultiSim == key.isMultiSim
- && serviceSwitch.carrierId == key.carrierId) {
+ && serviceSwitch.carrierId == key.carrierId
+ && serviceSwitch.isOpportunistic == key.isOpportunistic) {
return serviceSwitch;
}
}
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramController.java b/src/java/com/android/internal/telephony/satellite/DatagramController.java
index 370f0a1..05aef83 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramController.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramController.java
@@ -35,10 +35,10 @@
import android.os.Looper;
import android.os.SystemProperties;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.satellite.ISatelliteDatagramCallback;
import android.telephony.satellite.SatelliteDatagram;
import android.telephony.satellite.SatelliteManager;
+import android.util.Log;
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
@@ -682,22 +682,22 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java b/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
index bc7d5d1..0d4a2da 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
@@ -40,7 +40,6 @@
import android.os.Looper;
import android.os.Message;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.satellite.SatelliteDatagram;
import android.telephony.satellite.SatelliteManager;
import android.telephony.satellite.SatelliteSessionStats;
@@ -1418,31 +1417,31 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
- private static void logw(@NonNull String log) { Rlog.w(TAG, log); }
+ private static void logw(@NonNull String log) { Log.w(TAG, log); }
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void plogw(@NonNull String log) {
- Rlog.w(TAG, log);
+ Log.w(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.warn(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java b/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
index 9995c4f..26d456b 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
@@ -38,11 +38,11 @@
import android.os.RemoteException;
import android.provider.Telephony;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.SubscriptionManager;
import android.telephony.satellite.ISatelliteDatagramCallback;
import android.telephony.satellite.SatelliteDatagram;
import android.telephony.satellite.SatelliteManager;
+import android.util.Log;
import android.util.Pair;
import com.android.internal.R;
@@ -892,33 +892,33 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private static void logw(@NonNull String log) {
- Rlog.w(TAG, log);
+ Log.w(TAG, log);
}
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void plogw(@NonNull String log) {
- Rlog.w(TAG, log);
+ Log.w(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.warn(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
diff --git a/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java b/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java
index 4b53178..0e6233a 100644
--- a/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java
+++ b/src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java
@@ -18,8 +18,8 @@
import android.annotation.NonNull;
import android.telephony.NetworkRegistrationInfo;
-import android.telephony.Rlog;
import android.text.TextUtils;
+import android.util.Log;
import java.util.List;
@@ -60,6 +60,6 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
}
diff --git a/src/java/com/android/internal/telephony/satellite/PointingAppController.java b/src/java/com/android/internal/telephony/satellite/PointingAppController.java
index 5b3550a..4846323 100644
--- a/src/java/com/android/internal/telephony/satellite/PointingAppController.java
+++ b/src/java/com/android/internal/telephony/satellite/PointingAppController.java
@@ -36,12 +36,12 @@
import android.os.SystemProperties;
import android.os.UserHandle;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.SubscriptionManager;
import android.telephony.satellite.ISatelliteTransmissionUpdateCallback;
import android.telephony.satellite.PointingInfo;
import android.telephony.satellite.SatelliteManager;
import android.text.TextUtils;
+import android.util.Log;
import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
@@ -563,22 +563,22 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteController.java b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
index 672a064..e4cf041 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteController.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteController.java
@@ -7337,44 +7337,44 @@
}
private static void logv(@NonNull String log) {
- Rlog.v(TAG, log);
+ Log.v(TAG, log);
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void logw(@NonNull String log) {
- Rlog.w(TAG, log);
+ Log.w(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void plogw(@NonNull String log) {
- Rlog.w(TAG, log);
+ Log.w(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.warn(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
}
private void plogv(@NonNull String log) {
- Rlog.v(TAG, log);
+ Log.v(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
@@ -7865,6 +7865,8 @@
if (preSelectedSatelliteSubId != getSelectedSatelliteSubId()) {
plogd("selectBindingSatelliteSubscription: SelectedSatelliteSubId changed");
mSatelliteSubIdChangedRegistrants.notifyRegistrants();
+ handleEventSelectedNbIotSatelliteSubscriptionChanged(selectedSubId);
+ handleCarrierRoamingNtnAvailableServicesChanged();
evaluateCarrierRoamingNtnEligibilityChange();
}
@@ -7879,8 +7881,6 @@
mControllerMetricsStats.setIsNtnOnlyCarrier(isNtnOnlyCarrier());
}
plogd("selectBindingSatelliteSubscription: SelectedSatelliteSubId=" + selectedSubId);
- handleEventSelectedNbIotSatelliteSubscriptionChanged(selectedSubId);
- handleCarrierRoamingNtnAvailableServicesChanged();
}
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
@@ -8563,6 +8563,7 @@
}
mCtsSatelliteAccessAllowedSubIds.clear();
mCtsSatelliteAccessAllowedSubIds.addAll(subIdList);
+ selectBindingSatelliteSubscription(false);
return true;
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java b/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java
index 9ceca72..2ebd258 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java
@@ -33,7 +33,6 @@
import android.telephony.IBooleanConsumer;
import android.telephony.IIntegerConsumer;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.satellite.NtnSignalStrength;
import android.telephony.satellite.SatelliteCapabilities;
import android.telephony.satellite.SatelliteDatagram;
@@ -48,6 +47,7 @@
import android.telephony.satellite.stub.SatelliteModemState;
import android.telephony.satellite.stub.SatelliteService;
import android.text.TextUtils;
+import android.util.Log;
import android.util.Pair;
import com.android.internal.R;
@@ -1426,22 +1426,22 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteOptimizedApplicationsTracker.java b/src/java/com/android/internal/telephony/satellite/SatelliteOptimizedApplicationsTracker.java
index 636c04e..df656df 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteOptimizedApplicationsTracker.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteOptimizedApplicationsTracker.java
@@ -31,9 +31,9 @@
import android.os.Message;
import android.os.UserHandle;
import android.os.UserManager;
+import android.util.Log;
import com.android.internal.telephony.PackageChangeReceiver;
-import com.android.telephony.Rlog;
import java.util.ArrayList;
import java.util.HashMap;
@@ -247,10 +247,10 @@
}
private void log(String str) {
- Rlog.i(TAG, str);
+ Log.i(TAG, str);
}
private void loge(String str) {
- Rlog.e(TAG, str);
+ Log.e(TAG, str);
}
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
index d33f828..a7e35c9 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
@@ -48,7 +48,6 @@
import android.provider.DeviceConfig;
import android.telecom.Connection;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -59,6 +58,7 @@
import android.telephony.satellite.SatelliteManager;
import android.telephony.satellite.SatelliteSubscriberProvisionStatus;
import android.text.TextUtils;
+import android.util.Log;
import android.util.Pair;
import android.util.SparseArray;
@@ -859,26 +859,26 @@
}
private static void logv(@NonNull String log) {
- Rlog.v(TAG, log);
+ Log.v(TAG, log);
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private void plogd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.debug(TAG, log);
}
}
private void ploge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
if (mPersistentLogger != null) {
mPersistentLogger.error(TAG, log);
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java b/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
index 3afaf9f..a658139 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
@@ -33,7 +33,6 @@
import android.telephony.DropBoxManagerLoggerBackend;
import android.telephony.NetworkRegistrationInfo;
import android.telephony.PersistentLogger;
-import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -52,6 +51,7 @@
import android.telephony.satellite.stub.SatelliteModemState;
import android.telephony.satellite.stub.SatelliteResult;
import android.text.TextUtils;
+import android.util.Log;
import com.android.internal.R;
import com.android.internal.telephony.CommandException;
@@ -738,14 +738,14 @@
}
private static void logd(@NonNull String log) {
- Rlog.d(TAG, log);
+ Log.d(TAG, log);
}
private static void loge(@NonNull String log) {
- Rlog.e(TAG, log);
+ Log.e(TAG, log);
}
private static void logv(@NonNull String log) {
- Rlog.v(TAG, log);
+ Log.v(TAG, log);
}
}