summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Thomas Nguyen <tnd@google.com> 2025-03-21 11:37:18 -0700
committer Thomas Nguyen <tnd@google.com> 2025-03-21 11:37:18 -0700
commit58a68fe14178dbbbb4333215f59c5d6d799335de (patch)
tree150b2f219fef7f2f238a598bcc5cdc78192a4c2f
parentdf35ff6aeb802c9b5daec1f77ea5592460b38d86 (diff)
Don't send selected satellite subscription ID changed when there is no change
- Replace Rlog with Log since it does not work with mock modem Flag: EXEMPT bugfix Bug: 405143491 Test: SatelliteManagerTestOnMockService Manual test Change-Id: I221d161d970c3cbfdc80d417718aaeaad4cb2b79
-rw-r--r--src/java/com/android/internal/telephony/satellite/DatagramController.java10
-rw-r--r--src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java13
-rw-r--r--src/java/com/android/internal/telephony/satellite/DatagramReceiver.java14
-rw-r--r--src/java/com/android/internal/telephony/satellite/NtnCapabilityResolver.java4
-rw-r--r--src/java/com/android/internal/telephony/satellite/PointingAppController.java10
-rw-r--r--src/java/com/android/internal/telephony/satellite/SatelliteController.java21
-rw-r--r--src/java/com/android/internal/telephony/satellite/SatelliteModemInterface.java10
-rw-r--r--src/java/com/android/internal/telephony/satellite/SatelliteOptimizedApplicationsTracker.java6
-rw-r--r--src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java12
-rw-r--r--src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java8
10 files changed, 54 insertions, 54 deletions
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramController.java b/src/java/com/android/internal/telephony/satellite/DatagramController.java
index 370f0a1461..05aef83188 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.Build;
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 @@ public class DatagramController {
}
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 bc7d5d142f..0d4a2daefe 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.Handler;
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 @@ public class DatagramDispatcher extends Handler {
}
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 9995c4f4db..26d456bcd3 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.Message;
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 @@ public class DatagramReceiver extends Handler {
}
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 4b5317896a..0e6233a34a 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 @@ package com.android.internal.telephony.satellite;
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 @@ public class NtnCapabilityResolver {
}
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 5b3550a3f0..484632356f 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.RemoteException;
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 @@ public class PointingAppController {
}
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 0d6a2250a7..ecadb41efb 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 @@ public class SatelliteController extends Handler {
}
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 @@ public class SatelliteController extends Handler {
if (preSelectedSatelliteSubId != getSelectedSatelliteSubId()) {
plogd("selectBindingSatelliteSubscription: SelectedSatelliteSubId changed");
mSatelliteSubIdChangedRegistrants.notifyRegistrants();
+ handleEventSelectedNbIotSatelliteSubscriptionChanged(selectedSubId);
+ handleCarrierRoamingNtnAvailableServicesChanged();
evaluateCarrierRoamingNtnEligibilityChange();
}
@@ -7879,8 +7881,6 @@ public class SatelliteController extends Handler {
mControllerMetricsStats.setIsNtnOnlyCarrier(isNtnOnlyCarrier());
}
plogd("selectBindingSatelliteSubscription: SelectedSatelliteSubId=" + selectedSubId);
- handleEventSelectedNbIotSatelliteSubscriptionChanged(selectedSubId);
- handleCarrierRoamingNtnAvailableServicesChanged();
}
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
@@ -8563,6 +8563,7 @@ public class SatelliteController extends Handler {
}
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 9ceca72817..2ebd258a1b 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.os.RemoteException;
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.ISatelliteListener;
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 @@ public class SatelliteModemInterface {
}
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 636c04e3e5..df656df0e1 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.Looper;
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 @@ public class SatelliteOptimizedApplicationsTracker {
}
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 d33f8280da..a7e35c9841 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.os.SystemProperties;
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.ISatelliteProvisionStateCallback;
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 @@ public class SatelliteSOSMessageRecommender extends Handler {
}
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 3afaf9f654..a6581398e0 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.CellIdentity;
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.NTRadioTechnology;
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 @@ public class SatelliteServiceUtils {
}
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);
}
}