Merge "Change name from ProvisionSubscriberId to SatelliteSubscriberInfo." into main (f49879c9) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/satellite/SatelliteManager.java

+6 −7

telephony/java/android/telephony/satellite/ProvisionSubscriberId.aidl→telephony/java/android/telephony/satellite/SatelliteSubscriberInfo.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,4 +16,4 @@

	package android.telephony.satellite;		package android.telephony.satellite;

	parcelable ProvisionSubscriberId;		parcelable SatelliteSubscriberInfo;

telephony/java/android/telephony/satellite/ProvisionSubscriberId.java→telephony/java/android/telephony/satellite/SatelliteSubscriberInfo.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@ import com.android.internal.telephony.flags.Flags;
	import java.util.Objects;		import java.util.Objects;

	/**		/**
	* ProvisionSubscriberId		* SatelliteSubscriberInfo
	*		*
	* Satellite Gateway client will use these subscriber ids to register with satellite gateway service		* Satellite Gateway client will use these subscriber ids to register with satellite gateway service
	* which identify user subscription with unique subscriber ids. These subscriber ids can be any		* which identify user subscription with unique subscriber ids. These subscriber ids can be any
	@@ -35,7 +35,7 @@ import java.util.Objects;
	* @hide		* @hide
	*/		*/
	@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
	public final class ProvisionSubscriberId implements Parcelable {		public final class SatelliteSubscriberInfo implements Parcelable {
	/** provision subscriberId */		/** provision subscriberId */
	@NonNull		@NonNull
	private String mSubscriberId;		private String mSubscriberId;
	@@ -49,14 +49,14 @@ public final class ProvisionSubscriberId implements Parcelable {
	/**		/**
	* @hide		* @hide
	*/		*/
	public ProvisionSubscriberId(@NonNull String subscriberId, @NonNull int carrierId,		public SatelliteSubscriberInfo(@NonNull String subscriberId, @NonNull int carrierId,
	@NonNull String niddApn) {		@NonNull String niddApn) {
	this.mCarrierId = carrierId;		this.mCarrierId = carrierId;
	this.mSubscriberId = subscriberId;		this.mSubscriberId = subscriberId;
	this.mNiddApn = niddApn;		this.mNiddApn = niddApn;
	}		}

	private ProvisionSubscriberId(Parcel in) {		private SatelliteSubscriberInfo(Parcel in) {
	readFromParcel(in);		readFromParcel(in);
	}		}

	@@ -72,16 +72,16 @@ public final class ProvisionSubscriberId implements Parcelable {
	}		}

	@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
	public static final @android.annotation.NonNull Creator<ProvisionSubscriberId> CREATOR =		public static final @android.annotation.NonNull Creator<SatelliteSubscriberInfo> CREATOR =
	new Creator<ProvisionSubscriberId>() {		new Creator<SatelliteSubscriberInfo>() {
	@Override		@Override
	public ProvisionSubscriberId createFromParcel(Parcel in) {		public SatelliteSubscriberInfo createFromParcel(Parcel in) {
	return new ProvisionSubscriberId(in);		return new SatelliteSubscriberInfo(in);
	}		}

	@Override		@Override
	public ProvisionSubscriberId[] newArray(int size) {		public SatelliteSubscriberInfo[] newArray(int size) {
	return new ProvisionSubscriberId[size];		return new SatelliteSubscriberInfo[size];
	}		}
	};		};

	@@ -148,7 +148,7 @@ public final class ProvisionSubscriberId implements Parcelable {
	public boolean equals(Object o) {		public boolean equals(Object o) {
	if (this == o) return true;		if (this == o) return true;
	if (o == null \|\| getClass() != o.getClass()) return false;		if (o == null \|\| getClass() != o.getClass()) return false;
	ProvisionSubscriberId that = (ProvisionSubscriberId) o;		SatelliteSubscriberInfo that = (SatelliteSubscriberInfo) o;
	return mSubscriberId.equals(that.mSubscriberId) && mCarrierId		return mSubscriberId.equals(that.mSubscriberId) && mCarrierId
	== that.mCarrierId && mNiddApn.equals(that.mNiddApn);		== that.mCarrierId && mNiddApn.equals(that.mNiddApn);
	}		}

telephony/java/android/telephony/satellite/stub/ProvisionSubscriberId.aidl→telephony/java/android/telephony/satellite/stub/SatelliteSubscriberInfo.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@ package android.telephony.satellite.stub;
	/**		/**
	* {@hide}		* {@hide}
	*/		*/
	parcelable ProvisionSubscriberId {		parcelable SatelliteSubscriberInfo {
	/** provision subscriberId */		/** provision subscriberId */
	String subscriberId;		String subscriberId;

telephony/java/com/android/internal/telephony/ITelephony.aidl

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -254,7 +254,6 @@ public final class SatelliteManager {
	*/		*/
	public static final String KEY_PROVISION_SATELLITE_TOKENS = "provision_satellite";		public static final String KEY_PROVISION_SATELLITE_TOKENS = "provision_satellite";


	/**		/**
	* The request was successfully processed.		* The request was successfully processed.
	*/		*/
	@@ -2643,7 +2642,7 @@ public final class SatelliteManager {
	@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)		@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)
	@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
	public void requestProvisionSubscriberIds(@NonNull @CallbackExecutor Executor executor,		public void requestProvisionSubscriberIds(@NonNull @CallbackExecutor Executor executor,
	@NonNull OutcomeReceiver<List<ProvisionSubscriberId>, SatelliteException> callback) {		@NonNull OutcomeReceiver<List<SatelliteSubscriberInfo>, SatelliteException> callback) {
	Objects.requireNonNull(executor);		Objects.requireNonNull(executor);
	Objects.requireNonNull(callback);		Objects.requireNonNull(callback);

	@@ -2655,10 +2654,10 @@ public final class SatelliteManager {
	protected void onReceiveResult(int resultCode, Bundle resultData) {		protected void onReceiveResult(int resultCode, Bundle resultData) {
	if (resultCode == SATELLITE_RESULT_SUCCESS) {		if (resultCode == SATELLITE_RESULT_SUCCESS) {
	if (resultData.containsKey(KEY_REQUEST_PROVISION_SUBSCRIBER_ID_TOKEN)) {		if (resultData.containsKey(KEY_REQUEST_PROVISION_SUBSCRIBER_ID_TOKEN)) {
	List<ProvisionSubscriberId> list =		List<SatelliteSubscriberInfo> list =
	resultData.getParcelableArrayList(		resultData.getParcelableArrayList(
	KEY_REQUEST_PROVISION_SUBSCRIBER_ID_TOKEN,		KEY_REQUEST_PROVISION_SUBSCRIBER_ID_TOKEN,
	ProvisionSubscriberId.class);		SatelliteSubscriberInfo.class);
	executor.execute(() -> Binder.withCleanCallingIdentity(() ->		executor.execute(() -> Binder.withCleanCallingIdentity(() ->
	callback.onResult(list)));		callback.onResult(list)));
	} else {		} else {
	@@ -2743,9 +2742,9 @@ public final class SatelliteManager {
	}		}

	/**		/**
	* Deliver the list of provisioned satellite subscriber ids.		* Deliver the list of provisioned satellite subscriber infos.
	*		*
	* @param list List of ProvisionSubscriberId.		* @param list The list of provisioned satellite subscriber infos.
	* @param executor The executor on which the callback will be called.		* @param executor The executor on which the callback will be called.
	* @param callback The callback object to which the result will be delivered.		* @param callback The callback object to which the result will be delivered.
	*		*
	@@ -2754,7 +2753,7 @@ public final class SatelliteManager {
	*/		*/
	@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)		@RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,7 @@ import android.telephony.satellite.ISatelliteModemStateCallback;
	import android.telephony.satellite.NtnSignalStrength;		import android.telephony.satellite.NtnSignalStrength;
	import android.telephony.satellite.SatelliteCapabilities;		import android.telephony.satellite.SatelliteCapabilities;
	import android.telephony.satellite.SatelliteDatagram;		import android.telephony.satellite.SatelliteDatagram;
	import android.telephony.satellite.ProvisionSubscriberId;		import android.telephony.satellite.SatelliteSubscriberInfo;
	import com.android.ims.internal.IImsServiceFeatureCallback;		import com.android.ims.internal.IImsServiceFeatureCallback;
	import com.android.internal.telephony.CellNetworkScanResult;		import com.android.internal.telephony.CellNetworkScanResult;
	import com.android.internal.telephony.IBooleanConsumer;		import com.android.internal.telephony.IBooleanConsumer;
	@@ -3428,13 +3428,13 @@ interface ITelephony {
	void requestIsProvisioned(in String satelliteSubscriberId, in ResultReceiver result);		void requestIsProvisioned(in String satelliteSubscriberId, in ResultReceiver result);

	/**		/**
	* Deliver the list of provisioned satellite subscriber ids.		* Deliver the list of provisioned satellite subscriber infos.
	*		*
	* @param list List of provisioned satellite subscriber ids.		* @param list The list of provisioned satellite subscriber infos.
	* @param result The result receiver that returns whether deliver success or fail.		* @param result The result receiver that returns whether deliver success or fail.
	* @hide		* @hide
	*/		*/
	@JavaPassthrough(annotation="@android.annotation.RequiresPermission("		@JavaPassthrough(annotation="@android.annotation.RequiresPermission("
	+ "android.Manifest.permission.SATELLITE_COMMUNICATION)")		+ "android.Manifest.permission.SATELLITE_COMMUNICATION)")
	void provisionSatellite(in List<ProvisionSubscriberId> list, in ResultReceiver result);		void provisionSatellite(in List<SatelliteSubscriberInfo> list, in ResultReceiver result);
	}		}