Merge "Clear calling identity inside shouldSendSmsToDatagramDispatcher" into main (2d5cfa6e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -193,7 +193,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.concurrent.atomic.AtomicLong;
		import java.util.function.Consumer;
		import java.util.stream.Collectors;
		import com.android.internal.R;

		/**
		* Satellite controller is the backend service of
		@@ -8038,6 +8037,8 @@ public class SatelliteController extends Handler {

		/** Returns whether to send SMS to DatagramDispatcher or not. */
		public boolean shouldSendSmsToDatagramDispatcher(@Nullable Phone phone) {
		final long identity = Binder.clearCallingIdentity();
		try {
		if (!isInCarrierRoamingNbIotNtn(phone)) {
		return false;
		}
		@@ -8048,6 +8049,9 @@ public class SatelliteController extends Handler {

		int[] services = getSupportedServicesOnCarrierRoamingNtn(phone.getSubId());
		return ArrayUtils.contains(services, NetworkRegistrationInfo.SERVICE_TYPE_SMS);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		private boolean isWaitingForSatelliteModemOff() {