Merge "Change CarrierRoamingNtnListener to public API." into main (066af6b5) · Commits · e / os / android_frameworks_base

core/api/current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -47778,6 +47778,13 @@ package android.telephony {
		method public void onCarrierNetworkChange(boolean);
		}

		@FlaggedApi("com.android.internal.telephony.flags.telephony_satellite_apis") public static interface TelephonyCallback.CarrierRoamingNtnListener {
		method public default void onCarrierRoamingNtnAvailableServicesChanged(@NonNull int[]);
		method public default void onCarrierRoamingNtnEligibleStateChanged(boolean);
		method public void onCarrierRoamingNtnModeChanged(boolean);
		method public default void onCarrierRoamingNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrength);
		}

		public static interface TelephonyCallback.CellInfoListener {
		method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onCellInfoChanged(@NonNull java.util.List<android.telephony.CellInfo>);
		}
		@@ -49276,6 +49283,19 @@ package android.telephony.mbms {

		package android.telephony.satellite {

		@FlaggedApi("com.android.internal.telephony.flags.telephony_satellite_apis") public final class NtnSignalStrength implements android.os.Parcelable {
		ctor public NtnSignalStrength(@Nullable android.telephony.satellite.NtnSignalStrength);
		method public int describeContents();
		method public int getLevel();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.NtnSignalStrength> CREATOR;
		field public static final int NTN_SIGNAL_STRENGTH_GOOD = 3; // 0x3
		field public static final int NTN_SIGNAL_STRENGTH_GREAT = 4; // 0x4
		field public static final int NTN_SIGNAL_STRENGTH_MODERATE = 2; // 0x2
		field public static final int NTN_SIGNAL_STRENGTH_NONE = 0; // 0x0
		field public static final int NTN_SIGNAL_STRENGTH_POOR = 1; // 0x1
		}

		public final class SatelliteManager {
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_BASIC_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE, "carrier privileges"}) public void registerStateChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteStateChangeListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_BASIC_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE, "carrier privileges"}) public void unregisterStateChangeListener(@NonNull android.telephony.satellite.SatelliteStateChangeListener);

core/api/system-current.txt

+0 −20

Original line number	Diff line number	Diff line
		@@ -16318,13 +16318,6 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public default void onCallStatesChanged(@NonNull java.util.List<android.telephony.CallState>);
		}

		@FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static interface TelephonyCallback.CarrierRoamingNtnListener {
		method public default void onCarrierRoamingNtnAvailableServicesChanged(@NonNull int[]);
		method public default void onCarrierRoamingNtnEligibleStateChanged(boolean);
		method public void onCarrierRoamingNtnModeChanged(boolean);
		method public default void onCarrierRoamingNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrength);
		}

		@FlaggedApi("com.android.internal.telephony.flags.cellular_identifier_disclosure_indications") public static interface TelephonyCallback.CellularIdentifierDisclosedListener {
		method public void onCellularIdentifierDisclosedChanged(@NonNull android.telephony.CellularIdentifierDisclosure);
		}
		@@ -18969,19 +18962,6 @@ package android.telephony.satellite {
		method @NonNull public android.telephony.satellite.EnableRequestAttributes.Builder setEmergencyMode(boolean);
		}

		public final class NtnSignalStrength implements android.os.Parcelable {
		ctor public NtnSignalStrength(@Nullable android.telephony.satellite.NtnSignalStrength);
		method public int describeContents();
		method public int getLevel();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.NtnSignalStrength> CREATOR;
		field public static final int NTN_SIGNAL_STRENGTH_GOOD = 3; // 0x3
		field public static final int NTN_SIGNAL_STRENGTH_GREAT = 4; // 0x4
		field public static final int NTN_SIGNAL_STRENGTH_MODERATE = 2; // 0x2
		field public static final int NTN_SIGNAL_STRENGTH_NONE = 0; // 0x0
		field public static final int NTN_SIGNAL_STRENGTH_POOR = 1; // 0x1
		}

		public interface NtnSignalStrengthCallback {
		method public void onNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrength);
		}

core/java/android/telephony/TelephonyCallback.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -1810,11 +1810,9 @@ public class TelephonyCallback {

		/**
		* Interface for carrier roaming non-terrestrial network listener.
		*
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_SATELLITE_SYSTEM_APIS)

		@FlaggedApi(Flags.FLAG_TELEPHONY_SATELLITE_APIS)
		public interface CarrierRoamingNtnListener {
		/**
		* Callback invoked when carrier roaming non-terrestrial network mode changes.

telephony/java/android/telephony/satellite/NtnSignalStrength.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -16,22 +16,23 @@

		package android.telephony.satellite;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		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;

		/**
		* NTN signal strength related information.
		* @hide
		*/
		@SystemApi
		@FlaggedApi(Flags.FLAG_TELEPHONY_SATELLITE_APIS)
		public final class NtnSignalStrength implements Parcelable {
		/** Non-terrestrial network signal strength is not available. */
		public static final int NTN_SIGNAL_STRENGTH_NONE = 0;