Merge "Revert "Support NTN-Capable Subscription API"" into main (7f56d6d5) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −24

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import static android.telephony.CarrierConfigManager.KEY_EMERGENCY_MESSAGING_SUP
		import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL;
		import static android.telephony.CarrierConfigManager.KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT;
		import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL;
		import static android.telephony.CarrierConfigManager.KEY_SATELLITE_ESOS_SUPPORTED_BOOL;
		import static android.telephony.SubscriptionManager.SATELLITE_ATTACH_ENABLED_FOR_CARRIER;
		import static android.telephony.SubscriptionManager.SATELLITE_ENTITLEMENT_STATUS;
		import static android.telephony.SubscriptionManager.isValidSubscriptionId;
		@@ -3962,8 +3961,7 @@ public class SatelliteController extends Handler {
		KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL,
		KEY_CARRIER_ROAMING_SATELLITE_DEFAULT_SERVICES_INT_ARRAY,
		KEY_EMERGENCY_MESSAGING_SUPPORTED_BOOL,
		KEY_EMERGENCY_CALL_TO_SATELLITE_T911_HANDOVER_TIMEOUT_MILLIS_INT,
		KEY_SATELLITE_ESOS_SUPPORTED_BOOL);
		KEY_EMERGENCY_CALL_TO_SATELLITE_T911_HANDOVER_TIMEOUT_MILLIS_INT);
		if (config == null \|\| config.isEmpty()) {
		config = CarrierConfigManager.getDefaultConfig();
		}
		@@ -3980,7 +3978,6 @@ public class SatelliteController extends Handler {
		}

		updateCarrierConfig(subId);
		updateSatelliteESOSSupported(subId);
		updateEntitlementPlmnListPerCarrier(subId);
		updateSupportedSatelliteServicesForActiveSubscriptions();
		processNewCarrierConfigData(subId);
		@@ -4044,26 +4041,6 @@ public class SatelliteController extends Handler {
		}
		}

		/**
		* Update the value of SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED stored in the database based
		* on the value in the carrier config.
		*/
		private void updateSatelliteESOSSupported(int subId) {
		if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
		return;
		}

		boolean isSatelliteESosSupportedFromDB =
		mSubscriptionManagerService.getSatelliteESOSSupported(subId);
		boolean isSatelliteESosSupportedFromCarrierConfig = getConfigForSubId(subId).getBoolean(
		KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);
		if (isSatelliteESosSupportedFromDB != isSatelliteESosSupportedFromCarrierConfig) {
		mSubscriptionManagerService.setSatelliteESOSSupported(subId,
		isSatelliteESosSupportedFromCarrierConfig);
		logd("updateSatelliteESOSSupported: " + isSatelliteESosSupportedFromCarrierConfig);
		}
		}

		@NonNull
		private String[] readStringArrayFromOverlayConfig(@ArrayRes int id) {
		String[] strArray = null;

src/java/com/android/internal/telephony/subscription/SubscriptionDatabaseManager.java

+6 −33

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ public class SubscriptionDatabaseManager extends Handler {
		SimInfo.COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER,
		SubscriptionInfoInternal::getSatelliteAttachEnabledForCarrier),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_IS_ONLY_NTN,
		SimInfo.COLUMN_IS_NTN,
		SubscriptionInfoInternal::getOnlyNonTerrestrialNetwork),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_SERVICE_CAPABILITIES,
		@@ -293,10 +293,7 @@ public class SubscriptionDatabaseManager extends Handler {
		SubscriptionInfoInternal::getSatelliteEntitlementStatus),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS,
		SubscriptionInfoInternal::getSatelliteEntitlementPlmns),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED,
		SubscriptionInfoInternal::getSatelliteESOSSupported)
		SubscriptionInfoInternal::getSatelliteEntitlementPlmns)
		);

		/**
		@@ -426,7 +423,7 @@ public class SubscriptionDatabaseManager extends Handler {
		SimInfo.COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER,
		SubscriptionDatabaseManager::setSatelliteAttachEnabledForCarrier),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_IS_ONLY_NTN,
		SimInfo.COLUMN_IS_NTN,
		SubscriptionDatabaseManager::setNtn),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_SERVICE_CAPABILITIES,
		@@ -436,10 +433,7 @@ public class SubscriptionDatabaseManager extends Handler {
		SubscriptionDatabaseManager::setTransferStatus),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_STATUS,
		SubscriptionDatabaseManager::setSatelliteEntitlementStatus),
		new AbstractMap.SimpleImmutableEntry<>(
		SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED,
		SubscriptionDatabaseManager::setSatelliteESOSSupported)
		SubscriptionDatabaseManager::setSatelliteEntitlementStatus)
		);

		/**
		@@ -2069,7 +2063,7 @@ public class SubscriptionDatabaseManager extends Handler {
		if (!mFeatureFlags.oemEnabledSatelliteFlag()) {
		return;
		}
		writeDatabaseAndCacheHelper(subId, SimInfo.COLUMN_IS_ONLY_NTN, isNtn,
		writeDatabaseAndCacheHelper(subId, SimInfo.COLUMN_IS_NTN, isNtn,
		SubscriptionInfoInternal.Builder::setOnlyNonTerrestrialNetwork);
		}

		@@ -2167,23 +2161,6 @@ public class SubscriptionDatabaseManager extends Handler {
		setSatelliteEntitlementPlmns(subId, satelliteEntitlementPlmns);
		}

		/**
		* Set whether the carrier roaming to satellite is using ESOS for emergency messaging.
		*
		* @param subId Subscription id.
		* @param isSatelliteESOSSupported whether the carrier roaming to satellite is using ESOS for
		* emergency messaging.
		* @throws IllegalArgumentException if the subscription does not exist.
		*/
		public void setSatelliteESOSSupported(int subId, int isSatelliteESOSSupported) {
		if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
		return;
		}
		writeDatabaseAndCacheHelper(subId,
		SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED, isSatelliteESOSSupported,
		SubscriptionInfoInternal.Builder::setSatelliteESOSSupported);
		}

		/**
		* Reload the database from content provider to the cache. This must be a synchronous operation
		* to prevent cache/database out-of-sync. Callers should be cautious to call this method because
		@@ -2425,16 +2402,12 @@ public class SubscriptionDatabaseManager extends Handler {
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS)));
		if (mFeatureFlags.oemEnabledSatelliteFlag()) {
		builder.setOnlyNonTerrestrialNetwork(cursor.getInt(cursor.getColumnIndexOrThrow(
		SimInfo.COLUMN_IS_ONLY_NTN)));
		SimInfo.COLUMN_IS_NTN)));
		}
		if (mFeatureFlags.supportPsimToEsimConversion()) {
		builder.setTransferStatus(cursor.getInt(cursor.getColumnIndexOrThrow(
		SimInfo.COLUMN_TRANSFER_STATUS)));
		}
		if (mFeatureFlags.carrierRoamingNbIotNtn()) {
		builder.setSatelliteESOSSupported(cursor.getInt(
		cursor.getColumnIndexOrThrow(SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED)));
		}
		return builder.build();
		}

src/java/com/android/internal/telephony/subscription/SubscriptionInfoInternal.java

+2 −38

Original line number	Diff line number	Diff line
		@@ -491,12 +491,6 @@ public class SubscriptionInfoInternal {
		*/
		@NonNull private final String mSatelliteEntitlementPlmns;

		/**
		* Whether the carrier roaming to satellite is using ESOS for emergency messaging.
		* By default, its disabled. It is intended to use integer to fit the database format.
		*/
		private final int mIsSatelliteESOSSupported;

		/**
		* Constructor from builder.
		*
		@@ -576,7 +570,6 @@ public class SubscriptionInfoInternal {
		this.mTransferStatus = builder.mTransferStatus;
		this.mIsSatelliteEntitlementStatus = builder.mIsSatelliteEntitlementStatus;
		this.mSatelliteEntitlementPlmns = builder.mSatelliteEntitlementPlmns;
		this.mIsSatelliteESOSSupported = builder.mIsSatelliteESOSSupported;
		}

		/**
		@@ -1273,13 +1266,6 @@ public class SubscriptionInfoInternal {
		return mSatelliteEntitlementPlmns;
		}

		/**
		* @return {@code 1} if the carrier roaming to satellite is using ESOS for emergency messaging.
		*/
		public int getSatelliteESOSSupported() {
		return mIsSatelliteESOSSupported;
		}

		/** @return converted {@link SubscriptionInfo}. */
		@NonNull
		public SubscriptionInfo toSubscriptionInfo() {
		@@ -1319,7 +1305,6 @@ public class SubscriptionInfoInternal {
		.setServiceCapabilities(
		SubscriptionManager.getServiceCapabilitiesSet(mServiceCapabilities))
		.setTransferStatus(mTransferStatus)
		.setSatelliteESOSSupported(mIsSatelliteESOSSupported == 1)
		.build();
		}

		@@ -1383,7 +1368,6 @@ public class SubscriptionInfoInternal {
		+ " transferStatus=" + mTransferStatus
		+ " satelliteEntitlementStatus=" + mIsSatelliteEntitlementStatus
		+ " satelliteEntitlementPlmns=" + mSatelliteEntitlementPlmns
		+ " isSatelliteESOSSupported=" + mIsSatelliteESOSSupported
		+ "]";
		}

		@@ -1446,8 +1430,7 @@ public class SubscriptionInfoInternal {
		&& mServiceCapabilities == that.mServiceCapabilities
		&& mTransferStatus == that.mTransferStatus
		&& mIsSatelliteEntitlementStatus == that.mIsSatelliteEntitlementStatus
		&& mSatelliteEntitlementPlmns.equals(that.mSatelliteEntitlementPlmns)
		&& mIsSatelliteESOSSupported == that.mIsSatelliteESOSSupported;
		&& mSatelliteEntitlementPlmns.equals(that.mSatelliteEntitlementPlmns);
		}

		@Override
		@@ -1480,7 +1463,7 @@ public class SubscriptionInfoInternal {
		mIsSatelliteEnabled, mCardId, mIsGroupDisabled,
		mIsSatelliteAttachEnabledForCarrier, mIsOnlyNonTerrestrialNetwork,
		mServiceCapabilities, mTransferStatus, mIsSatelliteEntitlementStatus,
		mSatelliteEntitlementPlmns, mIsSatelliteESOSSupported);
		mSatelliteEntitlementPlmns);
		result = 31 * result + Arrays.hashCode(mNativeAccessRules);
		result = 31 * result + Arrays.hashCode(mCarrierConfigAccessRules);
		result = 31 * result + Arrays.hashCode(mRcsConfig);
		@@ -1888,11 +1871,6 @@ public class SubscriptionInfoInternal {
		@NonNull
		private String mSatelliteEntitlementPlmns = "";

		/**
		* Whether the carrier roaming to satellite is using ESOS for emergency messaging.
		*/
		private int mIsSatelliteESOSSupported = 0;

		/**
		* Default constructor.
		*/
		@@ -1975,7 +1953,6 @@ public class SubscriptionInfoInternal {
		mTransferStatus = info.mTransferStatus;
		mIsSatelliteEntitlementStatus = info.mIsSatelliteEntitlementStatus;
		mSatelliteEntitlementPlmns = info.mSatelliteEntitlementPlmns;
		mIsSatelliteESOSSupported = info.mIsSatelliteESOSSupported;
		}

		/**
		@@ -2945,19 +2922,6 @@ public class SubscriptionInfoInternal {
		return this;
		}

		/**
		* Set whether the carrier roaming to satellite is using ESOS for emergency messaging.
		*
		* @param isSatelliteESOSSupported {@code 1} if the carrier roaming to satellite is using
		* ESOS for emergency messaging.
		* @return The builder
		*/
		@NonNull
		public Builder setSatelliteESOSSupported(int isSatelliteESOSSupported) {
		mIsSatelliteESOSSupported = isSatelliteESOSSupported;
		return this;
		}

		/**
		* Build the {@link SubscriptionInfoInternal}.
		*

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+2 −40

Original line number	Diff line number	Diff line
		@@ -193,10 +193,9 @@ public class SubscriptionManagerService extends ISub.Stub {
		SimInfo.COLUMN_NR_ADVANCED_CALLING_ENABLED,
		SimInfo.COLUMN_SATELLITE_ENABLED,
		SimInfo.COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER,
		SimInfo.COLUMN_IS_ONLY_NTN,
		SimInfo.COLUMN_IS_NTN,
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_STATUS,
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS,
		SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED
		SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS
		);

		/**
		@@ -4594,43 +4593,6 @@ public class SubscriptionManagerService extends ISub.Stub {
		.orElse(new ArrayList<>());
		}

		/**
		* Set the satellite ESOS supported value in the subscription database.
		*
		* @param subId subscription id.
		* @param isSatelliteESOSSupported {@code true} satellite ESOS supported true.
		*/
		public void setSatelliteESOSSupported(int subId, @NonNull boolean isSatelliteESOSSupported) {
		if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
		return;
		}
		try {
		mSubscriptionDatabaseManager.setSatelliteESOSSupported(subId,
		isSatelliteESOSSupported ? 1 : 0);
		} catch (IllegalArgumentException e) {
		loge("setSatelliteESOSSupported: invalid subId=" + subId);
		}
		}

		/**
		* Get the satellite ESOS supported value in the subscription database.
		*
		* @param subId subscription id.
		* @return the satellite ESOS supported true or false.
		*/
		public boolean getSatelliteESOSSupported(int subId) {
		if (!mFeatureFlags.carrierRoamingNbIotNtn()) {
		return false;
		}
		SubscriptionInfoInternal subInfo = mSubscriptionDatabaseManager.getSubscriptionInfoInternal(
		subId);
		if (subInfo == null) {
		return false;
		}

		return subInfo.getSatelliteESOSSupported() == 1;
		}

		/**
		* checks whether esim bootstrap is activated for any of the available active subscription info
		* list.

tests/telephonytests/src/com/android/internal/telephony/FakeTelephonyProvider.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -131,12 +131,11 @@ public class FakeTelephonyProvider extends MockContentProvider {
		+ Telephony.SimInfo.COLUMN_SATELLITE_ENABLED + " INTEGER DEFAULT 0,"
		+ Telephony.SimInfo.COLUMN_SATELLITE_ATTACH_ENABLED_FOR_CARRIER
		+ " INTEGER DEFAULT 1, "
		+ Telephony.SimInfo.COLUMN_IS_ONLY_NTN + " INTEGER DEFAULT 0,"
		+ Telephony.SimInfo.COLUMN_IS_NTN + " INTEGER DEFAULT 0,"
		+ Telephony.SimInfo.COLUMN_SERVICE_CAPABILITIES + " INTEGER DEFAULT 7,"
		+ Telephony.SimInfo.COLUMN_TRANSFER_STATUS + " INTEGER DEFAULT 0,"
		+ Telephony.SimInfo.COLUMN_SATELLITE_ENTITLEMENT_STATUS + " INTEGER DEFAULT 0,"
		+ Telephony.SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS + " TEXT,"
		+ Telephony.SimInfo.COLUMN_SATELLITE_ESOS_SUPPORTED + " INTEGER DEFAULT 0"
		+ Telephony.SimInfo.COLUMN_SATELLITE_ENTITLEMENT_PLMNS + " TEXT"
		+ ");";
		}