Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b76c1640 authored by rambowang's avatar rambowang Committed by Rambo Wang
Browse files

Clean up 25Q2 aconfig flag satellite_state_change_listener

This change cleans up 25Q2 release flag
com.android.internal.telephony.flags.satellite_state_change_listener

Bug: 357638490
Test: m -j
Flag: EXEMPT removing com.android.internal.telephony.flags.satellite_state_change_listener
Change-Id: Ifbb3c34909c4b271bf65f8bc5361c16ccac58314
parent 4512e1eb
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -11366,7 +11366,7 @@ package android.content {
    field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1
    field public static final String RESTRICTIONS_SERVICE = "restrictions";
    field public static final String ROLE_SERVICE = "role";
    field @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") public static final String SATELLITE_SERVICE = "satellite";
    field public static final String SATELLITE_SERVICE = "satellite";
    field public static final String SEARCH_SERVICE = "search";
    field @FlaggedApi("android.os.security_state_service") public static final String SECURITY_STATE_SERVICE = "security_state";
    field public static final String SENSOR_SERVICE = "sensor";
@@ -49224,13 +49224,13 @@ package android.telephony.mbms {
package android.telephony.satellite {
  @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") public final class SatelliteManager {
    method @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") @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 @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") @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);
  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);
    field @FlaggedApi("com.android.internal.telephony.flags.satellite_25q4_apis") public static final String PROPERTY_SATELLITE_DATA_OPTIMIZED = "android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED";
  }
  @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") public interface SatelliteStateChangeListener {
  public interface SatelliteStateChangeListener {
    method public void onEnabledStateChanged(boolean);
  }
+1 −1
Original line number Diff line number Diff line
@@ -19003,7 +19003,7 @@ package android.telephony.satellite {
    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteInfo> CREATOR;
  }
  @FlaggedApi("com.android.internal.telephony.flags.satellite_state_change_listener") public final class SatelliteManager {
  public final class SatelliteManager {
    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void addAttachRestrictionForCarrier(int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.telephony.satellite.SatelliteManager.SatelliteException>);
    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionService(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
+0 −1
Original line number Diff line number Diff line
@@ -6870,7 +6870,6 @@ public abstract class Context {
     * @see #getSystemService(String)
     * @see android.telephony.satellite.SatelliteManager
     */
    @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_SATELLITE_STATE_CHANGE_LISTENER)
    public static final String SATELLITE_SERVICE = "satellite";

    /**
+0 −3
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import java.util.stream.Collectors;
 * is not reliable.
 */
@SystemService(Context.SATELLITE_SERVICE)
@FlaggedApi(Flags.FLAG_SATELLITE_STATE_CHANGE_LISTENER)
@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SATELLITE)
public final class SatelliteManager {
    private static final String TAG = "SatelliteManager";
@@ -859,7 +858,6 @@ public final class SatelliteManager {
     * @see SatelliteStateChangeListener
     * @see TelephonyManager#hasCarrierPrivileges()
     */
    @FlaggedApi(Flags.FLAG_SATELLITE_STATE_CHANGE_LISTENER)
    @RequiresPermission(anyOf = {android.Manifest.permission.READ_BASIC_PHONE_STATE,
            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
            android.Manifest.permission.READ_PHONE_STATE,
@@ -888,7 +886,6 @@ public final class SatelliteManager {
     * @see SatelliteStateChangeListener
     * @see TelephonyManager#hasCarrierPrivileges()
     */
    @FlaggedApi(Flags.FLAG_SATELLITE_STATE_CHANGE_LISTENER)
    @RequiresPermission(anyOf = {android.Manifest.permission.READ_BASIC_PHONE_STATE,
            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
            android.Manifest.permission.READ_PHONE_STATE,
+0 −5
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@

package android.telephony.satellite;

import android.annotation.FlaggedApi;

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

import java.util.concurrent.Executor;

/**
@@ -33,7 +29,6 @@ import java.util.concurrent.Executor;
 * @see SatelliteManager#registerStateChangeListener(Executor, SatelliteStateChangeListener)
 * @see SatelliteManager#unregisterStateChangeListener(SatelliteStateChangeListener)
 */
@FlaggedApi(Flags.FLAG_SATELLITE_STATE_CHANGE_LISTENER)
public interface SatelliteStateChangeListener {
    /**
     * Called when satellite modem enabled state may have changed.