diff options
Diffstat (limited to 'telephony')
17 files changed, 0 insertions, 193 deletions
diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index a8c077d24ed9..9c102a52fc1f 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -366,7 +366,6 @@ public final class DisconnectCause { /** * Indicates that the call was unable to be made because the satellite modem is enabled. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_ENABLED = 82; //********************************************************************************************* diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 4b175c134d84..57167c9dc498 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -900,7 +900,6 @@ public class SubscriptionInfo implements Parcelable { * @return {@code true} if it is a non-terrestrial network subscription, {@code false} * otherwise. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public boolean isOnlyNonTerrestrialNetwork() { return mIsOnlyNonTerrestrialNetwork; } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 41569deeddb5..6e0304b58489 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1241,7 +1241,6 @@ public class TelephonyManager { * {@link #EXTRA_EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT} will not be included in the event * {@link #EVENT_DISPLAY_EMERGENCY_MESSAGE}. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final String EVENT_DISPLAY_EMERGENCY_MESSAGE = "android.telephony.event.DISPLAY_EMERGENCY_MESSAGE"; @@ -1256,7 +1255,6 @@ public class TelephonyManager { * <p> * Set in the extras for the {@link #EVENT_DISPLAY_EMERGENCY_MESSAGE} connection event. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE = "android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE"; @@ -1264,7 +1262,6 @@ public class TelephonyManager { * Extra key used with the {@link #EVENT_DISPLAY_EMERGENCY_MESSAGE} for a {@link PendingIntent} * which will be launched by the Dialer app. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT = "android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT"; diff --git a/telephony/java/android/telephony/satellite/AntennaDirection.java b/telephony/java/android/telephony/satellite/AntennaDirection.java index c690f9852bd0..22412e6efadf 100644 --- a/telephony/java/android/telephony/satellite/AntennaDirection.java +++ b/telephony/java/android/telephony/satellite/AntennaDirection.java @@ -16,14 +16,11 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.telephony.flags.Flags; - import java.util.Objects; /** @@ -41,7 +38,6 @@ import java.util.Objects; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public final class AntennaDirection implements Parcelable { /** Antenna x axis direction. */ private float mX; @@ -66,13 +62,11 @@ public final class AntennaDirection implements Parcelable { } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int describeContents() { return 0; } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void writeToParcel(@NonNull Parcel out, int flags) { out.writeFloat(mX); out.writeFloat(mY); @@ -80,7 +74,6 @@ public final class AntennaDirection implements Parcelable { } @NonNull - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final Creator<AntennaDirection> CREATOR = new Creator<>() { @Override @@ -125,17 +118,14 @@ public final class AntennaDirection implements Parcelable { return Objects.hash(mX, mY, mZ); } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public float getX() { return mX; } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public float getY() { return mY; } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public float getZ() { return mZ; } diff --git a/telephony/java/android/telephony/satellite/AntennaPosition.java b/telephony/java/android/telephony/satellite/AntennaPosition.java index d6440fc7a119..a730e3f67143 100644 --- a/telephony/java/android/telephony/satellite/AntennaPosition.java +++ b/telephony/java/android/telephony/satellite/AntennaPosition.java @@ -16,14 +16,11 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.telephony.flags.Flags; - import java.util.Objects; /** @@ -32,7 +29,6 @@ import java.util.Objects; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public final class AntennaPosition implements Parcelable { /** Antenna direction used for satellite communication. */ @NonNull private AntennaDirection mAntennaDirection; @@ -53,20 +49,17 @@ public final class AntennaPosition implements Parcelable { } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int describeContents() { return 0; } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void writeToParcel(@NonNull Parcel out, int flags) { out.writeParcelable(mAntennaDirection, flags); out.writeInt(mSuggestedHoldPosition); } @NonNull - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final Creator<AntennaPosition> CREATOR = new Creator<>() { @Override @@ -107,13 +100,11 @@ public final class AntennaPosition implements Parcelable { } @NonNull - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public AntennaDirection getAntennaDirection() { return mAntennaDirection; } @SatelliteManager.DeviceHoldPosition - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int getSuggestedHoldPosition() { return mSuggestedHoldPosition; } diff --git a/telephony/java/android/telephony/satellite/EnableRequestAttributes.java b/telephony/java/android/telephony/satellite/EnableRequestAttributes.java index bc9d23081214..6f9b4a7e8897 100644 --- a/telephony/java/android/telephony/satellite/EnableRequestAttributes.java +++ b/telephony/java/android/telephony/satellite/EnableRequestAttributes.java @@ -16,12 +16,9 @@ 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.concurrent.Executor; import java.util.function.Consumer; @@ -31,7 +28,6 @@ import java.util.function.Consumer; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public class EnableRequestAttributes { /** {@code true} to enable satellite and {@code false} to disable satellite */ private boolean mIsEnabled; @@ -61,7 +57,6 @@ public class EnableRequestAttributes { /** * @return Whether satellite is to be enabled */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public boolean isEnabled() { return mIsEnabled; } @@ -69,7 +64,6 @@ public class EnableRequestAttributes { /** * @return Whether demo mode is to be enabled */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public boolean isDemoMode() { return mIsDemoMode; } @@ -77,7 +71,6 @@ public class EnableRequestAttributes { /** * @return Whether satellite is to be enabled for emergency mode */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public boolean isEmergencyMode() { return mIsEmergencyMode; } @@ -85,13 +78,11 @@ public class EnableRequestAttributes { /** * The builder class of {@link EnableRequestAttributes} */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final class Builder { private boolean mIsEnabled; private boolean mIsDemoMode = false; private boolean mIsEmergencyMode = false; - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public Builder(boolean isEnabled) { mIsEnabled = isEnabled; } @@ -104,7 +95,6 @@ public class EnableRequestAttributes { * {@code false} by Telephony. * @return The builder object */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public Builder setDemoMode(boolean isDemoMode) { if (mIsEnabled) { @@ -122,7 +112,6 @@ public class EnableRequestAttributes { * Telephony. * @return The builder object */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public Builder setEmergencyMode(boolean isEmergencyMode) { if (mIsEnabled) { @@ -136,7 +125,6 @@ public class EnableRequestAttributes { * * @return The {@link EnableRequestAttributes} instance. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public EnableRequestAttributes build() { return new EnableRequestAttributes(this); diff --git a/telephony/java/android/telephony/satellite/NtnSignalStrength.java b/telephony/java/android/telephony/satellite/NtnSignalStrength.java index 2fec423d1d65..bb53d8e472c1 100644 --- a/telephony/java/android/telephony/satellite/NtnSignalStrength.java +++ b/telephony/java/android/telephony/satellite/NtnSignalStrength.java @@ -16,7 +16,6 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -25,8 +24,6 @@ import android.os.Parcelable; import androidx.annotation.NonNull; -import com.android.internal.telephony.flags.Flags; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -35,22 +32,16 @@ import java.lang.annotation.RetentionPolicy; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public final class NtnSignalStrength implements Parcelable { /** Non-terrestrial network signal strength is not available. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NTN_SIGNAL_STRENGTH_NONE = 0; /** Non-terrestrial network signal strength is poor. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NTN_SIGNAL_STRENGTH_POOR = 1; /** Non-terrestrial network signal strength is moderate. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NTN_SIGNAL_STRENGTH_MODERATE = 2; /** Non-terrestrial network signal strength is good. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NTN_SIGNAL_STRENGTH_GOOD = 3; /** Non-terrestrial network signal strength is great. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NTN_SIGNAL_STRENGTH_GREAT = 4; @NtnSignalStrengthLevel private int mLevel; @@ -69,7 +60,6 @@ public final class NtnSignalStrength implements Parcelable { * Create a parcelable object to inform the current non-terrestrial signal strength * @hide */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public NtnSignalStrength(@NtnSignalStrengthLevel int level) { this.mLevel = level; } @@ -77,7 +67,6 @@ public final class NtnSignalStrength implements Parcelable { /** * This constructor is used to create a copy of an existing NtnSignalStrength object. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public NtnSignalStrength(@Nullable NtnSignalStrength source) { this.mLevel = (source == null) ? NTN_SIGNAL_STRENGTH_NONE : source.getLevel(); } @@ -89,7 +78,6 @@ public final class NtnSignalStrength implements Parcelable { /** * Returns notified non-terrestrial network signal strength level. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NtnSignalStrengthLevel public int getLevel() { return mLevel; } @@ -98,7 +86,6 @@ public final class NtnSignalStrength implements Parcelable { * @return 0 */ @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int describeContents() { return 0; } @@ -109,7 +96,6 @@ public final class NtnSignalStrength implements Parcelable { * May be 0 or {@link #PARCELABLE_WRITE_RETURN_VALUE}. */ @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void writeToParcel(@NonNull Parcel out, int flags) { out.writeInt(mLevel); } @@ -118,7 +104,6 @@ public final class NtnSignalStrength implements Parcelable { mLevel = in.readInt(); } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public static final Creator<NtnSignalStrength> CREATOR = new Creator<NtnSignalStrength>() { @Override public NtnSignalStrength createFromParcel(Parcel in) { diff --git a/telephony/java/android/telephony/satellite/NtnSignalStrengthCallback.java b/telephony/java/android/telephony/satellite/NtnSignalStrengthCallback.java index 4b79590b9bc6..b277b0efd4cd 100644 --- a/telephony/java/android/telephony/satellite/NtnSignalStrengthCallback.java +++ b/telephony/java/android/telephony/satellite/NtnSignalStrengthCallback.java @@ -16,24 +16,19 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; -import com.android.internal.telephony.flags.Flags; - /** * A callback class for notifying satellite signal strength change. * * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public interface NtnSignalStrengthCallback { /** * Called when non-terrestrial network signal strength changes. * @param ntnSignalStrength The new non-terrestrial network signal strength. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onNtnSignalStrengthChanged(@NonNull NtnSignalStrength ntnSignalStrength); } diff --git a/telephony/java/android/telephony/satellite/PointingInfo.java b/telephony/java/android/telephony/satellite/PointingInfo.java index 9440b65a61aa..d0c51bc48c7d 100644 --- a/telephony/java/android/telephony/satellite/PointingInfo.java +++ b/telephony/java/android/telephony/satellite/PointingInfo.java @@ -16,15 +16,12 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.telephony.flags.Flags; - import java.util.Objects; /** @@ -34,7 +31,6 @@ import java.util.Objects; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public final class PointingInfo implements Parcelable { /** Satellite azimuth in degrees */ private float mSatelliteAzimuthDegrees; @@ -55,19 +51,16 @@ public final class PointingInfo implements Parcelable { } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int describeContents() { return 0; } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void writeToParcel(@NonNull Parcel out, int flags) { out.writeFloat(mSatelliteAzimuthDegrees); out.writeFloat(mSatelliteElevationDegrees); } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final @android.annotation.NonNull Creator<PointingInfo> CREATOR = new Creator<PointingInfo>() { @Override @@ -113,7 +106,6 @@ public final class PointingInfo implements Parcelable { * Returns the azimuth of the satellite, in degrees. */ @FloatRange(from = -180, to = 180) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public float getSatelliteAzimuthDegrees() { return mSatelliteAzimuthDegrees; } @@ -122,7 +114,6 @@ public final class PointingInfo implements Parcelable { * Returns the elevation of the satellite, in degrees. */ @FloatRange(from = -90, to = 90) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public float getSatelliteElevationDegrees() { return mSatelliteElevationDegrees; } diff --git a/telephony/java/android/telephony/satellite/SatelliteCapabilities.java b/telephony/java/android/telephony/satellite/SatelliteCapabilities.java index f34522aedeac..a5b9deb67720 100644 --- a/telephony/java/android/telephony/satellite/SatelliteCapabilities.java +++ b/telephony/java/android/telephony/satellite/SatelliteCapabilities.java @@ -16,15 +16,12 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.telephony.flags.Flags; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -37,7 +34,6 @@ import java.util.Set; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public final class SatelliteCapabilities implements Parcelable { /** * List of technologies supported by the satellite modem. @@ -80,13 +76,11 @@ public final class SatelliteCapabilities implements Parcelable { } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int describeContents() { return 0; } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void writeToParcel(@NonNull Parcel out, int flags) { if (mSupportedRadioTechnologies != null && !mSupportedRadioTechnologies.isEmpty()) { out.writeInt(mSupportedRadioTechnologies.size()); @@ -112,7 +106,6 @@ public final class SatelliteCapabilities implements Parcelable { } } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public static final Creator<SatelliteCapabilities> CREATOR = new Creator<>() { @Override public SatelliteCapabilities createFromParcel(Parcel in) { @@ -172,7 +165,6 @@ public final class SatelliteCapabilities implements Parcelable { /** * @return The list of technologies supported by the satellite modem. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull @SatelliteManager.NTRadioTechnology public Set<Integer> getSupportedRadioTechnologies() { return mSupportedRadioTechnologies; @@ -184,7 +176,6 @@ public final class SatelliteCapabilities implements Parcelable { * @return {@code true} if UE needs to point to a satellite to send and receive data and * {@code false} otherwise. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public boolean isPointingRequired() { return mIsPointingRequired; } @@ -194,7 +185,6 @@ public final class SatelliteCapabilities implements Parcelable { * * @return The maximum number of bytes per datagram that can be sent over satellite. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int getMaxBytesPerOutgoingDatagram() { return mMaxBytesPerOutgoingDatagram; } @@ -214,7 +204,6 @@ public final class SatelliteCapabilities implements Parcelable { * @return Map key: {@link SatelliteManager.DeviceHoldPosition} value: AntennaPosition */ @NonNull - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public Map<Integer, AntennaPosition> getAntennaPositionMap() { return mAntennaPositionMap; } diff --git a/telephony/java/android/telephony/satellite/SatelliteCapabilitiesCallback.java b/telephony/java/android/telephony/satellite/SatelliteCapabilitiesCallback.java index b68dd5a150ff..b236cf64bf65 100644 --- a/telephony/java/android/telephony/satellite/SatelliteCapabilitiesCallback.java +++ b/telephony/java/android/telephony/satellite/SatelliteCapabilitiesCallback.java @@ -16,24 +16,19 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; -import com.android.internal.telephony.flags.Flags; - /** * A callback class for satellite capabilities change events. * * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public interface SatelliteCapabilitiesCallback { /** * Called when satellite capability has changed. * @param capabilities The new satellite capabilities. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onSatelliteCapabilitiesChanged(@NonNull SatelliteCapabilities capabilities); } diff --git a/telephony/java/android/telephony/satellite/SatelliteDatagram.java b/telephony/java/android/telephony/satellite/SatelliteDatagram.java index 4d67f80241f9..9037f0c4078d 100644 --- a/telephony/java/android/telephony/satellite/SatelliteDatagram.java +++ b/telephony/java/android/telephony/satellite/SatelliteDatagram.java @@ -16,21 +16,17 @@ package android.telephony.satellite; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.telephony.flags.Flags; - /** * SatelliteDatagram is used to store data that is to be sent or received over satellite. * Data is stored in byte array format. * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public final class SatelliteDatagram implements Parcelable { /** * Datagram to be sent or received over satellite. @@ -49,18 +45,15 @@ public final class SatelliteDatagram implements Parcelable { } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public int describeContents() { return 0; } @Override - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void writeToParcel(@NonNull Parcel out, int flags) { out.writeByteArray(mData); } - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public static final Creator<SatelliteDatagram> CREATOR = new Creator<>() { @Override @@ -80,7 +73,6 @@ public final class SatelliteDatagram implements Parcelable { * satellite provider. Client application should be aware of how to encode the datagram based * upon the satellite provider. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @NonNull public byte[] getSatelliteDatagram() { return mData; } diff --git a/telephony/java/android/telephony/satellite/SatelliteDatagramCallback.java b/telephony/java/android/telephony/satellite/SatelliteDatagramCallback.java index 9aaa986435cd..8b6e3ca44fd7 100644 --- a/telephony/java/android/telephony/satellite/SatelliteDatagramCallback.java +++ b/telephony/java/android/telephony/satellite/SatelliteDatagramCallback.java @@ -16,12 +16,9 @@ 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.concurrent.Executor; import java.util.function.Consumer; @@ -35,7 +32,6 @@ import java.util.function.Consumer; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public interface SatelliteDatagramCallback { /** * Called when there is an incoming datagram to be received. @@ -47,7 +43,6 @@ public interface SatelliteDatagramCallback { * that they received the datagram. If the callback is not received within * five minutes, Telephony will resend the datagram. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onSatelliteDatagramReceived(long datagramId, @NonNull SatelliteDatagram datagram, int pendingCount, @NonNull Consumer<Void> callback); } diff --git a/telephony/java/android/telephony/satellite/SatelliteManager.java b/telephony/java/android/telephony/satellite/SatelliteManager.java index 13096548a8ba..270d599e0a0a 100644 --- a/telephony/java/android/telephony/satellite/SatelliteManager.java +++ b/telephony/java/android/telephony/satellite/SatelliteManager.java @@ -148,7 +148,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static class SatelliteException extends Exception { @SatelliteResult private final int mErrorCode; @@ -157,7 +156,6 @@ public final class SatelliteManager { * * @param errorCode The {@link SatelliteResult}. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public SatelliteException(@SatelliteResult int errorCode) { mErrorCode = errorCode; } @@ -167,7 +165,6 @@ public final class SatelliteManager { * * @return The {@link SatelliteResult}. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @SatelliteResult public int getErrorCode() { return mErrorCode; } @@ -311,7 +308,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_SUCCESS = 0; /** @@ -319,7 +315,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_ERROR = 1; /** @@ -327,7 +322,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_SERVER_ERROR = 2; /** @@ -336,7 +330,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_SERVICE_ERROR = 3; /** @@ -345,7 +338,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_MODEM_ERROR = 4; /** @@ -354,7 +346,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_NETWORK_ERROR = 5; /** @@ -362,7 +353,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_INVALID_TELEPHONY_STATE = 6; /** @@ -370,7 +360,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_INVALID_MODEM_STATE = 7; /** @@ -379,7 +368,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_INVALID_ARGUMENTS = 8; /** @@ -388,7 +376,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_REQUEST_FAILED = 9; /** @@ -396,7 +383,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_RADIO_NOT_AVAILABLE = 10; /** @@ -404,7 +390,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_REQUEST_NOT_SUPPORTED = 11; /** @@ -412,7 +397,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_NO_RESOURCES = 12; /** @@ -420,7 +404,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_SERVICE_NOT_PROVISIONED = 13; /** @@ -428,7 +411,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_SERVICE_PROVISION_IN_PROGRESS = 14; /** @@ -438,7 +420,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_REQUEST_ABORTED = 15; /** @@ -446,7 +427,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_ACCESS_BARRED = 16; /** @@ -455,7 +435,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_NETWORK_TIMEOUT = 17; /** @@ -463,7 +442,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_NOT_REACHABLE = 18; /** @@ -471,7 +449,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_NOT_AUTHORIZED = 19; /** @@ -479,7 +456,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_NOT_SUPPORTED = 20; /** @@ -487,7 +463,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_REQUEST_IN_PROGRESS = 21; /** @@ -495,7 +470,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_MODEM_BUSY = 22; /** @@ -503,7 +477,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_ILLEGAL_STATE = 23; /** @@ -512,7 +485,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_RESULT_MODEM_TIMEOUT = 24; /** @@ -608,7 +580,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NT_RADIO_TECHNOLOGY_UNKNOWN = 0; /** @@ -616,7 +587,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NT_RADIO_TECHNOLOGY_NB_IOT_NTN = 1; /** @@ -624,7 +594,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NT_RADIO_TECHNOLOGY_NR_NTN = 2; /** @@ -632,7 +601,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NT_RADIO_TECHNOLOGY_EMTC_NTN = 3; /** @@ -640,7 +608,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int NT_RADIO_TECHNOLOGY_PROPRIETARY = 4; /** @hide */ @@ -659,7 +626,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DEVICE_HOLD_POSITION_UNKNOWN = 0; /** @@ -667,7 +633,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DEVICE_HOLD_POSITION_PORTRAIT = 1; /** @@ -675,7 +640,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DEVICE_HOLD_POSITION_LANDSCAPE_LEFT = 2; /** @@ -683,7 +647,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DEVICE_HOLD_POSITION_LANDSCAPE_RIGHT = 3; /** @hide */ @@ -701,7 +664,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DISPLAY_MODE_UNKNOWN = 0; /** @@ -709,7 +671,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DISPLAY_MODE_FIXED = 1; /** @@ -718,7 +679,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DISPLAY_MODE_OPENED = 2; /** @@ -727,7 +687,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DISPLAY_MODE_CLOSED = 3; /** @hide */ @@ -746,7 +705,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_SOS = 1; /** @@ -919,7 +877,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestEnabled(@NonNull EnableRequestAttributes attributes, @NonNull @CallbackExecutor Executor executor, @SatelliteResult @NonNull Consumer<Integer> resultListener) { @@ -968,7 +925,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestIsEnabled(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -1028,7 +984,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestIsDemoModeEnabled(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -1088,7 +1043,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestIsEmergencyModeEnabled(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -1148,7 +1102,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestIsSupported(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -1207,7 +1160,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestCapabilities(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<SatelliteCapabilities, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -1257,7 +1209,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_IDLE = 0; /** @@ -1265,7 +1216,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SENDING = 1; /** @@ -1275,7 +1225,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_SUCCESS = 2; /** @@ -1286,7 +1235,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_SEND_FAILED = 3; /** @@ -1294,7 +1242,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVING = 4; /** @@ -1304,7 +1251,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_SUCCESS = 5; /** @@ -1315,7 +1261,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_NONE = 6; /** @@ -1325,7 +1270,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_RECEIVE_FAILED = 7; /** @@ -1339,7 +1283,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_WAITING_TO_CONNECT = 8; /** @@ -1349,7 +1292,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_DATAGRAM_TRANSFER_STATE_UNKNOWN = -1; /** @hide */ @@ -1374,7 +1316,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_IDLE = 0; /** @@ -1382,7 +1323,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_LISTENING = 1; /** @@ -1390,7 +1330,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING = 2; /** @@ -1398,7 +1337,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_DATAGRAM_RETRYING = 3; /** @@ -1406,7 +1344,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_OFF = 4; /** @@ -1414,7 +1351,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_UNAVAILABLE = 5; /** @@ -1422,7 +1358,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_NOT_CONNECTED = 6; /** @@ -1430,7 +1365,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_CONNECTED = 7; /** @@ -1455,7 +1389,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int SATELLITE_MODEM_STATE_UNKNOWN = -1; /** @hide */ @@ -1481,7 +1414,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DATAGRAM_TYPE_UNKNOWN = 0; /** @@ -1489,7 +1421,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DATAGRAM_TYPE_SOS_MESSAGE = 1; /** @@ -1498,7 +1429,6 @@ public final class SatelliteManager { * @hide */ @SystemApi - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public static final int DATAGRAM_TYPE_LOCATION_SHARING = 2; /** @@ -1653,7 +1583,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @SuppressWarnings("SamShouldBeLast") public void startTransmissionUpdates(@NonNull @CallbackExecutor Executor executor, @SatelliteResult @NonNull Consumer<Integer> resultListener, @@ -1739,7 +1668,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void stopTransmissionUpdates(@NonNull SatelliteTransmissionUpdateCallback callback, @SuppressWarnings("ListenerLast") @NonNull @CallbackExecutor Executor executor, @SuppressWarnings("ListenerLast") @SatelliteResult @NonNull @@ -1800,7 +1728,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void provisionService(@NonNull String token, @NonNull byte[] provisionData, @Nullable CancellationSignal cancellationSignal, @NonNull @CallbackExecutor Executor executor, @@ -1858,7 +1785,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void deprovisionService(@NonNull String token, @NonNull @CallbackExecutor Executor executor, @SatelliteResult @NonNull Consumer<Integer> resultListener) { @@ -1904,7 +1830,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @SatelliteResult public int registerForProvisionStateChanged( @NonNull @CallbackExecutor Executor executor, @NonNull SatelliteProvisionStateCallback callback) { @@ -1959,7 +1884,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void unregisterForProvisionStateChanged( @NonNull SatelliteProvisionStateCallback callback) { Objects.requireNonNull(callback); @@ -2000,7 +1924,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestIsProvisioned(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -2058,7 +1981,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @SatelliteResult public int registerForModemStateChanged( @NonNull @CallbackExecutor Executor executor, @NonNull SatelliteModemStateCallback callback) { @@ -2121,7 +2043,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void unregisterForModemStateChanged( @NonNull SatelliteModemStateCallback callback) { Objects.requireNonNull(callback); @@ -2164,7 +2085,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @SatelliteResult public int registerForIncomingDatagram( @NonNull @CallbackExecutor Executor executor, @NonNull SatelliteDatagramCallback callback) { @@ -2223,7 +2143,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void unregisterForIncomingDatagram(@NonNull SatelliteDatagramCallback callback) { Objects.requireNonNull(callback); ISatelliteDatagramCallback internalCallback = @@ -2264,7 +2183,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void pollPendingDatagrams(@NonNull @CallbackExecutor Executor executor, @SatelliteResult @NonNull Consumer<Integer> resultListener) { Objects.requireNonNull(executor); @@ -2322,7 +2240,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void sendDatagram(@DatagramType int datagramType, @NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI, @NonNull @CallbackExecutor Executor executor, @@ -2373,7 +2290,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestIsCommunicationAllowedForCurrentLocation( @NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) { @@ -2497,7 +2413,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestTimeForNextSatelliteVisibility(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<Duration, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -2711,7 +2626,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void setDeviceAlignedWithSatellite(boolean isAligned) { try { ITelephony telephony = getITelephony(); @@ -3072,7 +2986,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void requestNtnSignalStrength(@NonNull @CallbackExecutor Executor executor, @NonNull OutcomeReceiver<NtnSignalStrength, SatelliteException> callback) { Objects.requireNonNull(executor); @@ -3138,7 +3051,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void registerForNtnSignalStrengthChanged(@NonNull @CallbackExecutor Executor executor, @NonNull NtnSignalStrengthCallback callback) { Objects.requireNonNull(executor); @@ -3190,7 +3102,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void unregisterForNtnSignalStrengthChanged(@NonNull NtnSignalStrengthCallback callback) { Objects.requireNonNull(callback); INtnSignalStrengthCallback internalCallback = @@ -3227,7 +3138,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) @SatelliteResult public int registerForCapabilitiesChanged( @NonNull @CallbackExecutor Executor executor, @NonNull SatelliteCapabilitiesCallback callback) { @@ -3273,7 +3183,6 @@ public final class SatelliteManager { */ @SystemApi @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public void unregisterForCapabilitiesChanged( @NonNull SatelliteCapabilitiesCallback callback) { Objects.requireNonNull(callback); diff --git a/telephony/java/android/telephony/satellite/SatelliteModemStateCallback.java b/telephony/java/android/telephony/satellite/SatelliteModemStateCallback.java index 040fbbbb2689..ef26b17e15f5 100644 --- a/telephony/java/android/telephony/satellite/SatelliteModemStateCallback.java +++ b/telephony/java/android/telephony/satellite/SatelliteModemStateCallback.java @@ -27,13 +27,11 @@ import com.android.internal.telephony.flags.Flags; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public interface SatelliteModemStateCallback { /** * Called when satellite modem state changes. * @param state The new satellite modem state. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onSatelliteModemStateChanged(@SatelliteManager.SatelliteModemState int state); /** diff --git a/telephony/java/android/telephony/satellite/SatelliteProvisionStateCallback.java b/telephony/java/android/telephony/satellite/SatelliteProvisionStateCallback.java index 6b95eb3c1ac3..fe5d2a143778 100644 --- a/telephony/java/android/telephony/satellite/SatelliteProvisionStateCallback.java +++ b/telephony/java/android/telephony/satellite/SatelliteProvisionStateCallback.java @@ -30,7 +30,6 @@ import java.util.List; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public interface SatelliteProvisionStateCallback { /** * Called when satellite provision state changes. @@ -40,7 +39,6 @@ public interface SatelliteProvisionStateCallback { * It is generally expected that the provisioning app retries if * provisioning fails. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onSatelliteProvisionStateChanged(boolean provisioned); /** diff --git a/telephony/java/android/telephony/satellite/SatelliteTransmissionUpdateCallback.java b/telephony/java/android/telephony/satellite/SatelliteTransmissionUpdateCallback.java index e18fad3eda79..9c6eb8f43804 100644 --- a/telephony/java/android/telephony/satellite/SatelliteTransmissionUpdateCallback.java +++ b/telephony/java/android/telephony/satellite/SatelliteTransmissionUpdateCallback.java @@ -29,14 +29,12 @@ import com.android.internal.telephony.flags.Flags; * @hide */ @SystemApi -@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) public interface SatelliteTransmissionUpdateCallback { /** * Called when the satellite position changed. * * @param pointingInfo The pointing info containing the satellite location. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onSatellitePositionChanged(@NonNull PointingInfo pointingInfo); /** @@ -46,7 +44,6 @@ public interface SatelliteTransmissionUpdateCallback { * @param sendPendingCount The number of datagrams that are currently being sent. * @param errorCode If datagram transfer failed, the reason for failure. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onSendDatagramStateChanged( @SatelliteManager.SatelliteDatagramTransferState int state, int sendPendingCount, @SatelliteManager.SatelliteResult int errorCode); @@ -70,7 +67,6 @@ public interface SatelliteTransmissionUpdateCallback { * @param receivePendingCount The number of datagrams that are currently pending to be received. * @param errorCode If datagram transfer failed, the reason for failure. */ - @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG) void onReceiveDatagramStateChanged( @SatelliteManager.SatelliteDatagramTransferState int state, int receivePendingCount, @SatelliteManager.SatelliteResult int errorCode); |