Merge "Add api for provision state change per SatelliteSubscriberInfo" into main (764fb203) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/satellite/ISatelliteProvisionStateCallback.aidl

+12 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.telephony.satellite;

		import android.telephony.satellite.SatelliteSubscriberProvisionStatus;

		/**
		* Interface for satellite provision state callback.
		* @hide
		@@ -27,4 +29,14 @@ oneway interface ISatelliteProvisionStateCallback {
		* @param provisioned True means the service is provisioned and false means it is not.
		*/
		void onSatelliteProvisionStateChanged(in boolean provisioned);

		/**
		* Called when the provisioning state of one or more SatelliteSubscriberInfos changes.
		*
		* @param satelliteSubscriberProvisionStatus The List contains the latest provisioning states of
		* the SatelliteSubscriberInfos.
		* @hide
		*/
		void onSatelliteSubscriptionProvisionStateChanged(in List<SatelliteSubscriberProvisionStatus>
		satelliteSubscriberProvisionStatus);
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -1404,6 +1404,16 @@ public final class SatelliteManager {
		() -> callback.onSatelliteProvisionStateChanged(
		provisioned)));
		}

		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		@Override
		public void onSatelliteSubscriptionProvisionStateChanged(
		@NonNull List<SatelliteSubscriberProvisionStatus>
		satelliteSubscriberProvisionStatus) {
		executor.execute(() -> Binder.withCleanCallingIdentity(() ->
		callback.onSatelliteSubscriptionProvisionStateChanged(
		satelliteSubscriberProvisionStatus)));
		}
		};
		sSatelliteProvisionStateCallbackMap.put(callback, internalCallback);
		return telephony.registerForSatelliteProvisionStateChanged(

telephony/java/android/telephony/satellite/SatelliteProvisionStateCallback.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -17,10 +17,13 @@
		package android.telephony.satellite;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;

		import com.android.internal.telephony.flags.Flags;

		import java.util.List;

		/**
		* A callback class for monitoring satellite provision state change events.
		*
		@@ -39,4 +42,16 @@ public interface SatelliteProvisionStateCallback {
		*/
		@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
		void onSatelliteProvisionStateChanged(boolean provisioned);

		/**
		* Called when the provisioning state of one or more SatelliteSubscriberInfos changes.
		*
		* @param satelliteSubscriberProvisionStatus The List contains the latest provisioning states
		* of the SatelliteSubscriberInfos.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		default void onSatelliteSubscriptionProvisionStateChanged(
		@NonNull List<SatelliteSubscriberProvisionStatus>
		satelliteSubscriberProvisionStatus) {};
		}

telephony/java/android/telephony/satellite/SatelliteSubscriberProvisionStatus.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2024, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.telephony.satellite;

		parcelable SatelliteSubscriberProvisionStatus;
		No newline at end of file

telephony/java/android/telephony/satellite/SatelliteSubscriberProvisionStatus.java

0 → 100644

+174 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.telephony.satellite;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.telephony.flags.Flags;

		import java.util.Objects;

		/**
		* Represents the provisioning state of SatelliteSubscriberInfo.
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public class SatelliteSubscriberProvisionStatus implements Parcelable {
		private SatelliteSubscriberInfo mSubscriberInfo;
		/** {@code true} mean the satellite subscriber is provisioned, {@code false} otherwise. */
		private boolean mProvisionStatus;

		public SatelliteSubscriberProvisionStatus(@NonNull Builder builder) {
		mSubscriberInfo = builder.mSubscriberInfo;
		mProvisionStatus = builder.mProvisionStatus;
		}

		/**
		* Builder class for constructing SatelliteSubscriberProvisionStatus objects
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public static class Builder {
		private SatelliteSubscriberInfo mSubscriberInfo;
		private boolean mProvisionStatus;

		/**
		* Set the SatelliteSubscriberInfo and returns the Builder class.
		* @hide
		*/
		public Builder setSatelliteSubscriberInfo(SatelliteSubscriberInfo satelliteSubscriberInfo) {
		mSubscriberInfo = satelliteSubscriberInfo;
		return this;
		}

		/**
		* Set the SatelliteSubscriberInfo's provisionStatus and returns the Builder class.
		* @hide
		*/
		@NonNull
		public Builder setProvisionStatus(boolean provisionStatus) {
		mProvisionStatus = provisionStatus;
		return this;
		}

		/**
		* Returns SatelliteSubscriberProvisionStatus object.
		* @hide
		*/
		@NonNull
		public SatelliteSubscriberProvisionStatus build() {
		return new SatelliteSubscriberProvisionStatus(this);
		}
		}

		private SatelliteSubscriberProvisionStatus(Parcel in) {
		readFromParcel(in);
		}

		/**
		* @hide
		*/
		@Override
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public void writeToParcel(@NonNull Parcel out, int flags) {
		mSubscriberInfo.writeToParcel(out, flags);
		out.writeBoolean(mProvisionStatus);
		}

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

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

		/**
		* @hide
		*/
		@Override
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public int describeContents() {
		return 0;
		}

		/**
		* SatelliteSubscriberInfo that has a provisioning state.
		* @return SatelliteSubscriberInfo.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public @NonNull SatelliteSubscriberInfo getSatelliteSubscriberInfo() {
		return mSubscriberInfo;
		}

		/**
		* SatelliteSubscriberInfo's provisioning state.
		* @return {@code true} means provisioning. {@code false} means deprovisioning.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
		public @NonNull boolean getProvisionStatus() {
		return mProvisionStatus;
		}

		@NonNull
		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder();

		sb.append("SatelliteSubscriberInfo:");
		sb.append(mSubscriberInfo);
		sb.append(",");

		sb.append("ProvisionStatus:");
		sb.append(mProvisionStatus);
		return sb.toString();
		}

		@Override
		public int hashCode() {
		return Objects.hash(mSubscriberInfo, mProvisionStatus);
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) return true;
		if (!(o instanceof SatelliteSubscriberProvisionStatus)) return false;
		SatelliteSubscriberProvisionStatus that = (SatelliteSubscriberProvisionStatus) o;
		return Objects.equals(mSubscriberInfo, that.mSubscriberInfo)
		&& mProvisionStatus == that.mProvisionStatus;
		}

		private void readFromParcel(Parcel in) {
		mSubscriberInfo = in.readParcelable(SatelliteSubscriberInfo.class.getClassLoader(),
		SatelliteSubscriberInfo.class);
		mProvisionStatus = in.readBoolean();
		}
		}